x2gobroker.git - master (branch) updated: ef3376100abb26ecf5befeb5e2c76b12656fa131 - x2go-commits

7 Dec 2012

The branch, master has been updated
       via  ef3376100abb26ecf5befeb5e2c76b12656fa131 (commit)
       via  7bbd55cb27c9fe59ebe38c8938676b3cca068f75 (commit)
      from  23f9762174258d904af10acd9f91c195c0f17881 (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 -----------------------------------------------------------------
commit ef3376100abb26ecf5befeb5e2c76b12656fa131
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Dec 7 09:11:40 2012 +0100

    no <br> text in text/plain web renderer anymore, waits for fixing #81 in X2Go BTS

commit 7bbd55cb27c9fe59ebe38c8938676b3cca068f75
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Dec 7 09:11:29 2012 +0100

    fix daemon startup

-----------------------------------------------------------------------

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

The diff of changes is:

diff --git a/sbin/x2gobroker b/sbin/x2gobroker
index f6cbfe7..a9c79ad 100755
--- a/sbin/x2gobroker
+++ b/sbin/x2gobroker
@@ -27,7 +27,7 @@ import argparse
 import socket
 
 try:
-    import x2gobroker
+    import x2gobroker.defaults
 except ImportError:
     sys.path.insert(0, os.path.join(os.getcwd(), '..'))
     import x2gobroker.defaults
@@ -61,7 +61,7 @@ if __name__ == "__main__":
 # import classes serving the different web.py URLs
 from x2gobroker.web.plain import *
 #from x2gobroker.web.json import *
-from x2gobroker.web.html import *
+#from x2gobroker.web.html import *
 
 # define the web.py URLs
 urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain',
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).

    