[X2go-Commits] x2gobroker.git - master (branch) updated: 6a6166dd7717a5b608b05445b2cf210bedccc90a

The branch, master has been updated via 6a6166dd7717a5b608b05445b2cf210bedccc90a (commit) from b00be4d28ff4a848b515900162254ad24d12e0a2 (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 6a6166dd7717a5b608b05445b2cf210bedccc90a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 25 10:20:19 2013 +0100 more global bugfixing, tidying up after submodule rename ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/brokers/zeroconf_broker.py | 2 +- x2gobroker/tests/test_broker_base.py | 34 +++++++++++++-------------- x2gobroker/tests/test_broker_inifile.py | 10 ++++---- x2gobroker/tests/test_broker_zeroconf.py | 6 ++--- x2gobroker/tests/test_web_plain_base.py | 1 - x2gobroker/tests/test_web_plain_zeroconf.py | 1 - x2gobroker/web/plain.py | 1 - 8 files changed, 27 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index e5fd314..17aec0e 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -578,7 +578,7 @@ class X2GoBroker(object): profile = self.get_profile(profile_id) acls = self.get_profile_acls(profile_id) - if self.check_acls(username, acls): + if self.check_profile_acls(username, acls): list_of_profiles.update(profile) return list_of_profiles diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index cdd3b0c..2d513b3 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -28,7 +28,7 @@ __NAME__ = 'x2gobroker-pylib' import uuid # Python X2GoBroker modules -import base +import base_broker as base class X2GoBroker(base.X2GoBroker): diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 0e5f7ec..f751e02 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -22,7 +22,7 @@ import tempfile import copy # Python X2GoBroker modules -import x2gobroker.brokers.base +import x2gobroker.brokers.base_broker as base import x2gobroker.defaults class TestX2GoBrokerBackendBase(unittest.TestCase): @@ -34,7 +34,7 @@ class TestX2GoBrokerBackendBase(unittest.TestCase): tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - return x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + return base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) ### TEST CONFIGURATION: <backend> >> enable = true|false @@ -48,7 +48,7 @@ enable = false tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) self.assertEqual(base_backend.is_enabled(), False) _config = """ [base] @@ -57,7 +57,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name) + base_backend = base.X2GoBroker(config_file=tf.name) self.assertEqual(base_backend.is_enabled(), True) tf.close() @@ -76,7 +76,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name) + base_backend = base.X2GoBroker(config_file=tf.name) self.assertEqual(base_backend.get_authentication_mechanism(), 'foo-auth-mech') _config = """ [global] @@ -89,7 +89,7 @@ auth-mech = bar-auth-mech tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) self.assertEqual(base_backend.get_authentication_mechanism(), 'bar-auth-mech') tf.close() @@ -108,7 +108,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name) + base_backend = base.X2GoBroker(config_file=tf.name) self.assertEqual(base_backend.get_userdb_service(), 'foo-user-db') _config = """ [global] @@ -121,7 +121,7 @@ user-db = bar-user-db tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) self.assertEqual(base_backend.get_userdb_service(), 'bar-user-db') tf.close() @@ -140,7 +140,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name) + base_backend = base.X2GoBroker(config_file=tf.name) self.assertEqual(base_backend.get_groupdb_service(), 'foo-group-db') _config = """ [global] @@ -153,7 +153,7 @@ group-db = bar-group-db tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) self.assertEqual(base_backend.get_groupdb_service(), 'bar-group-db') tf.close() @@ -171,7 +171,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name) + base_backend = base.X2GoBroker(config_file=tf.name) self.assertEqual(base_backend.get_users(), []) self.assertEqual(base_backend.has_user('any-user'), False) self.assertEqual(base_backend.get_groups(), []) @@ -193,7 +193,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name) + base_backend = base.X2GoBroker(config_file=tf.name) self.assertTrue( ( 'root' in base_backend.get_users() ) ) self.assertEqual(base_backend.has_user('root'), True) self.assertTrue( ( 'root' in base_backend.get_groups() ) ) @@ -215,7 +215,7 @@ check-credentials = false tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) self.assertEqual(base_backend.check_access(), True) tf.close() @@ -394,7 +394,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) users = base_backend.get_users() users.sort() self.assertEqual(users, ['flip', 'kassandra', 'maja', 'thekla', 'willi']) @@ -415,7 +415,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) username = 'willi' acls = { 'acl-groups-allow': ['ALL'], @@ -465,7 +465,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) username_f = 'flip' # is a male grasshopper username_m = 'maja' # is a female bee username_w = 'willi' # is a drone (male bee) @@ -531,7 +531,7 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - base_backend = x2gobroker.brokers.base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) username_f = 'flip' username_k = 'kassandra' username_m = 'maja' diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 3a55f34..2beabf7 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -22,7 +22,7 @@ import tempfile import copy # Python X2GoBroker modules -import x2gobroker.brokers.inifile +import x2gobroker.brokers.inifile_broker as inifile import x2gobroker.defaults class TestX2GoBrokerBackendInifile(unittest.TestCase): @@ -30,7 +30,7 @@ class TestX2GoBrokerBackendInifile(unittest.TestCase): ### TEST SESSION PROFILES: get_profile_ids() def test_getprofileids(self): - inifile_backend = x2gobroker.brokers.inifile.X2GoBroker(profile_config_file='../../etc/x2gobroker-sessionprofiles.conf') + 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', ] @@ -42,7 +42,7 @@ class TestX2GoBrokerBackendInifile(unittest.TestCase): ### TEST SESSION PROFILES: get_profile_defaults() def test_getprofiledefaults(self): - inifile_backend = x2gobroker.brokers.inifile.X2GoBroker(profile_config_file='../../etc/x2gobroker-sessionprofiles.conf') + inifile_backend = inifile.X2GoBroker(profile_config_file='../../etc/broker/x2gobroker-sessionprofiles.conf') _profile_defaults = inifile_backend.get_profile_defaults() _expected_profile_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_SESSIONPROFILE_DEFAULTS['DEFAULT']) for key in copy.deepcopy(_expected_profile_defaults): @@ -84,7 +84,7 @@ acl-users-order = deny-allow tf = tempfile.NamedTemporaryFile() print >> tf, _session_profiles tf.seek(0) - inifile_backend = x2gobroker.brokers.inifile.X2GoBroker(profile_config_file=tf.name) + inifile_backend = inifile.X2GoBroker(profile_config_file=tf.name) _expected_defaults = { 'exports': '', 'fullscreen': False, @@ -163,7 +163,7 @@ acl-users-order = deny-allow tf = tempfile.NamedTemporaryFile() print >> tf, _session_profiles tf.seek(0) - inifile_backend = x2gobroker.brokers.inifile.X2GoBroker(profile_config_file=tf.name) + inifile_backend = inifile.X2GoBroker(profile_config_file=tf.name) _expected_acl_defaults = { 'acl-clients-deny': ['ALL'], 'acl-clients-allow': ['10.0.0.0/16','10.1.0.0/16','admin-1.intern','admin-2.intern'], diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index 859cd40..1c08d6c 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -20,7 +20,7 @@ import unittest # Python X2GoBroker modules -import x2gobroker.brokers.zeroconf +import x2gobroker.brokers.zeroconf_broker class TestX2GoBrokerBackendZeroconf(unittest.TestCase): @@ -65,7 +65,7 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase): 'pack': u'16m-jpeg', }, } - zeroconf_backend = x2gobroker.brokers.zeroconf.X2GoBroker() + zeroconf_backend = x2gobroker.brokers.zeroconf_broker.X2GoBroker() _profiles = zeroconf_backend.list_profiles('user_foo') self.assertEqual(len(_profiles.keys()), 1) _key = _profiles.keys()[0] @@ -81,7 +81,7 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase): _output = { 'server': 'localhost:22', } - zeroconf_backend = x2gobroker.brokers.zeroconf.X2GoBroker() + zeroconf_backend = x2gobroker.brokers.zeroconf_broker.X2GoBroker() self.assertEqual(zeroconf_backend.select_profile('profile_bar'), _output) diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py index efb4aea..613ab8c 100644 --- a/x2gobroker/tests/test_web_plain_base.py +++ b/x2gobroker/tests/test_web_plain_base.py @@ -23,7 +23,6 @@ from paste.fixture import TestApp from nose.tools import * # Python X2GoBroker modules -import x2gobroker.brokers.base import x2gobroker.defaults from x2gobroker.web.plain import * diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index 70fcb7f..3bc09c9 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -23,7 +23,6 @@ from paste.fixture import TestApp from nose.tools import * # Python X2GoBroker modules -import x2gobroker.brokers.base import x2gobroker.defaults from x2gobroker.web.plain import * diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index ea0dfc8..135586d 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -90,7 +90,6 @@ class X2GoBrokerWebPlain: pass output += "Access granted\n" - ### ### X2GO BROKER TASKS ### 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).