[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-37-g56b1c6d

[X2Go dev team]

The branch, master has been updated
       via  56b1c6d8ed8b6e1812ff0310c3f72c78c232bf4e (commit)
      from  b7475b79b0a5a52ced74b919767240f5faf05115 (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 56b1c6d8ed8b6e1812ff0310c3f72c78c232bf4e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 1 19:12:48 2013 +0200

    finalize default inifile backend session profiles (incl. test)

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

Summary of changes:
 etc/broker/x2gobroker-sessionprofiles.conf |   44 ++++++++++++++--------------
 setup.py                                   |    1 +
 x2gobroker/tests/test_broker_inifile.py    |    4 +--
 3 files changed, 25 insertions(+), 24 deletions(-)

The diff of changes is:
diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
index a2faac9..dccfcf8 100644
--- a/etc/broker/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -147,18 +147,18 @@ command=MATE
 ## in front of one of the admin client machines.
 ##
 
-[pool-B-server-D-LXDE]
-user=
-host=server-d (server-d.domain.internet)
-name=LXDE - srv-D
-command=LXDE
-rootless=false
-acl-groups-allow=admins
-acl-groups-deny=ALL
+#[pool-B-server-D-LXDE]
+#user=
+#host=server-d (server-d.domain.internet)
+#name=LXDE - srv-D
+#command=LXDE
+#rootless=false
+#acl-groups-allow=admins
+#acl-groups-deny=ALL
 ## make sure hostnames in client ACLs are resolvable via libnss!!!
 #acl-clients-deny=ALL
 #acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local
-acl-any-order=deny-allow
+#acl-any-order=deny-allow
 
 ##
 ## EXAMPLE: pool-C (REAL LOAD BALANCING!!!)
@@ -184,17 +184,17 @@ acl-any-order=deny-allow
 ## DB backend.
 ##
 
-[pool-C-XFCE]
-user=
-host=s-E1 (10.0.2.11),s-E2 (10.0.2.12),s-E3 (10.0.2.13),s-E4 (10.0.2.14),s-E5 (10.0.2.15)
-name=XFCE - pool-C
-command=XFCE
-rootless=false
-acl-users-allow=testuser-A,testuser-B
-acl-users-deny=ALL
-acl-groups-allow=students,admins
-acl-groups-deny=ALL
-acl-any-order=deny-allow
+#[pool-C-XFCE]
+#user=
+#host=s-E1 (10.0.2.11),s-E2 (10.0.2.12),s-E3 (10.0.2.13),s-E4 (10.0.2.14),s-E5 (10.0.2.15)
+#name=XFCE - pool-C
+#command=XFCE
+#rootless=false
+#acl-users-allow=testuser-A,testuser-B
+#acl-users-deny=ALL
+#acl-groups-allow=students,admins
+#acl-groups-deny=ALL
+#acl-any-order=deny-allow
 # this server pool has a special broker setup for SSH authorized_keys
-broker-session-autologin=true
-broker-authorized-keys=/var/lib/x2gobroker/ssh/%u/authorized_keys
+#broker-session-autologin=true
+#broker-authorized-keys=/var/lib/x2gobroker/ssh/%u/authorized_keys
diff --git a/setup.py b/setup.py
index 9fa7ca1..a5eb5f8 100755
--- a/setup.py
+++ b/setup.py
@@ -43,4 +43,5 @@ setup(
     url = 'http://www.x2go.org',
     packages = find_packages('.'),
     package_dir = {'': '.'},
+    test_suite = "x2gobroker.tests.runalltests",
 )
diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py
index 809dc7a..45879cd 100644
--- a/x2gobroker/tests/test_broker_inifile.py
+++ b/x2gobroker/tests/test_broker_inifile.py
@@ -32,8 +32,8 @@ class TestX2GoBrokerBackendInifile(unittest.TestCase):
     def test_getprofileids(self):
         inifile_backend = inifile.X2GoBroker(profile_config_file='../../etc/broker/x2gobroker-sessionprofiles.conf')
         _profile_ids = inifile_backend.get_profile_ids()
-        self.assertEqual(len(_profile_ids), 5)
-        _expected_profile_ids = ['pool-A-server-A', 'pool-A-server-B', 'pool-A-server-C', 'pool-B-server-D-LXDE', 'pool-C-XFCE', ]
+        self.assertEqual(len(_profile_ids), 2)
+        _expected_profile_ids = [ "localhost-kde", "localhost-mate", ]
         for _id in _profile_ids:
             self.assertTrue( ( _id in _expected_profile_ids ) )
         for _id in _expected_profile_ids:


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).