[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.2-7-gc6e2cc4

X2Go dev team git-admin at x2go.org
Tue Jun 4 19:52:58 CEST 2013


The branch, master has been updated
       via  c6e2cc412e1906e9b1ebc986622bc666fe47cd48 (commit)
      from  851439d5d8a8f2235957dbf45955dc2f68c193dc (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 c6e2cc412e1906e9b1ebc986622bc666fe47cd48
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 4 19:47:33 2013 +0200

    test rootless parameter override for DESKTOP sessions

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

Summary of changes:
 x2gobroker/tests/test_broker_inifile.py |   33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

The diff of changes is:
diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py
index 5952f35..809dc7a 100644
--- a/x2gobroker/tests/test_broker_inifile.py
+++ b/x2gobroker/tests/test_broker_inifile.py
@@ -333,6 +333,39 @@ fullscreen = true
         list_of_profile_ids.sort()
         self.assertEqual(profile_ids, list_of_profile_ids)
 
+    ### TEST: list_profiles() method, check override of rootless param for DESKTOP sessions
+
+    def test_listprofiles_rootlessoverride(self):
+        username = 'foo'
+        _session_profiles = """
+[DEFAULT]
+rootless = true
+command = TERMINAL
+
+[testprofile1]
+user =
+
+[testprofile2]
+user =
+command = XFCE
+
+[testprofile3]
+user =
+command = KDE
+rootless = false
+"""
+        tf = tempfile.NamedTemporaryFile()
+        print >> tf, _session_profiles
+        tf.seek(0)
+        inifile_backend = inifile.X2GoBroker(profile_config_file=tf.name)
+        profiles = inifile_backend.list_profiles(username)
+        self.assertEqual(profiles['testprofile1']['command'], 'TERMINAL')
+        self.assertEqual(profiles['testprofile1']['rootless'], True)
+        self.assertEqual(profiles['testprofile2']['command'], 'XFCE')
+        self.assertEqual(profiles['testprofile2']['rootless'], False)
+        self.assertEqual(profiles['testprofile3']['command'], 'KDE')
+        self.assertEqual(profiles['testprofile3']['rootless'], False)
+
     ### TEST: list_profiles() method check acl capability
 
     def test_listprofileswithacls(self):


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