[X2Go-Commits] x2gobroker.git - tmp (branch) updated: ef3376100abb26ecf5befeb5e2c76b12656fa131

X2Go dev team git-admin at x2go.org
Tue Apr 23 21:08:36 CEST 2013


The branch, tmp has been updated
       via  ef3376100abb26ecf5befeb5e2c76b12656fa131 (commit)
      from  7bbd55cb27c9fe59ebe38c8938676b3cca068f75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/tests/test_web_plain_zeroconf.py |   18 ++++++++----------
 x2gobroker/web/plain.py                     |   12 ++++++------
 2 files changed, 14 insertions(+), 16 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py
index 69e36de..287ab89 100644
--- a/x2gobroker/tests/test_web_plain_zeroconf.py
+++ b/x2gobroker/tests/test_web_plain_zeroconf.py
@@ -79,11 +79,10 @@ desktop-shell = GNOME
         r.mustcontain('START_USER_SESSIONS')
         r.mustcontain('command=GNOME')
         r.mustcontain('END_USER_SESSIONS')
-        # FIXME: get html tags out of the text/plain web renderer, needs patching of X2Go Client
-        #r.mustcontain(no='<BR>',)
-        #r.mustcontain(no='<br>',)
-        #r.mustcontain(no='<BR />', )
-        #r.mustcontain(no='<br />', )
+        r.mustcontain(no='<BR>',)
+        r.mustcontain(no='<br>',)
+        r.mustcontain(no='<BR />', )
+        r.mustcontain(no='<br />', )
         tf.close()
 
     ### TEST TASK: selectsession (returns localhost as the only server, no SSH key, no session info)
@@ -104,11 +103,10 @@ auth-mech = testsuite
         assert_equal(r.status, 200)
         r.mustcontain('Access granted')
         r.mustcontain('SERVER:localhost:22')
-        # FIXME: get html tags out of the text/plain web renderer, needs patching of X2Go Client
-        #r.mustcontain(no='<BR>',)
-        #r.mustcontain(no='<br>',)
-        #r.mustcontain(no='<BR />', )
-        #r.mustcontain(no='<br />', )
+        r.mustcontain(no='<BR>',)
+        r.mustcontain(no='<br>',)
+        r.mustcontain(no='<BR />', )
+        r.mustcontain(no='<br />', )
         tf.close()
 
 
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index 9dff1dc..d158cfa 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -109,8 +109,8 @@ class X2GoBrokerWebPlain:
                 profiles = broker_backend.list_profiles(username)
                 if profiles:
                     # FIXME (in x2goclient): accept \n as EOL
-                    #output += "START_USER_SESSIONS\n"
-                    output += "START_USER_SESSIONS<br>"
+                    output += "START_USER_SESSIONS\n"
+                    #output += "START_USER_SESSIONS<br>"
                     for profile_id in profiles:
                         output += "[{profile_id}]".format(profile_id=profile_id)
                         for key in profiles[profile_id].keys():
@@ -122,13 +122,13 @@ class X2GoBrokerWebPlain:
                                 output += "{key}={value}".format(key=key, value=unicode(int(profiles[profile_id][key])))
 
                             # FIXME (in x2goclient): accept \n as EOL
-                            # output += "\n"
-                            output += "<br>"
+                            output += "\n"
+                            #output += "<br>"
 
                     output += "\n"
                     # FIXME (in x2goclient): accept \n as EOL
-                    #output += "END_USER_SESSIONS\n"
-                    output += "END_USER_SESSIONS<br>"
+                    output += "END_USER_SESSIONS\n"
+                    #output += "END_USER_SESSIONS<br>"
 
             elif task == 'selectsession':
 


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list