The branch, master has been updated via ad91c637065fada49cc741eae394287382f00660 (commit) from d79176f0865a1b9a66bb90e1ad33f4c47dc6ba75 (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 ad91c637065fada49cc741eae394287382f00660 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 28 06:12:10 2013 +0100 adapt tests and zeroconf broker to changes in commit 5b273ab1ecaf19c40ce1ea3de05290d5a7fc46cf ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/zeroconf_broker.py | 2 +- x2gobroker/tests/test_broker_inifile.py | 6 +++--- x2gobroker/tests/test_broker_zeroconf.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index c2d05e7..ad21567 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -76,7 +76,7 @@ class X2GoBroker(base.X2GoBroker): } return list_of_profiles - def select_session(self, profile_name): + def select_session(self, profile_id): selectprofile_output = { 'server': 'localhost', diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index acfb65f..ac33756 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -382,9 +382,9 @@ sshport = 44566 'server': 'test-3.local', 'port': 44566, } - self.assertEqual(inifile_backend.select_session('TEST-1'), _expected_result_1) - self.assertEqual(inifile_backend.select_session('TEST-2'), _expected_result_2) - self.assertEqual(inifile_backend.select_session('TEST-3'), _expected_result_3) + self.assertEqual(inifile_backend.select_session('testprofile1'), _expected_result_1) + self.assertEqual(inifile_backend.select_session('testprofile2'), _expected_result_2) + self.assertEqual(inifile_backend.select_session('testprofile3'), _expected_result_3) def test_suite(): diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index b417acf..0e97b66 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -83,7 +83,7 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase): 'port': 22, } zeroconf_backend = x2gobroker.brokers.zeroconf_broker.X2GoBroker() - self.assertEqual(zeroconf_backend.select_session('profile_bar'), _output) + self.assertEqual(zeroconf_backend.select_session('any-profile-id'), _output) def test_suite(): 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).