[X2Go-Commits] x2gobroker.git - master-inai (branch) updated: 23151c4e7770fed744369f21d9f3a3979ba0f18b
X2Go dev team
git-admin at x2go.org
Tue Apr 23 21:08:24 CEST 2013
The branch, master-inai has been updated
via 23151c4e7770fed744369f21d9f3a3979ba0f18b (commit)
from efadd7bc9a73ae99a0a537ec308a074666a085a0 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2gobroker/brokers/zeroconf_broker.py | 5 +++--
x2gobroker/tests/test_broker_zeroconf.py | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py
index 2d513b3..c2d05e7 100644
--- a/x2gobroker/brokers/zeroconf_broker.py
+++ b/x2gobroker/brokers/zeroconf_broker.py
@@ -76,9 +76,10 @@ class X2GoBroker(base.X2GoBroker):
}
return list_of_profiles
- def select_profile(self, profile_name):
+ def select_session(self, profile_name):
selectprofile_output = {
- 'server': 'localhost:22',
+ 'server': 'localhost',
+ 'port': 22,
}
return selectprofile_output
diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py
index 1c08d6c..5f0832a 100644
--- a/x2gobroker/tests/test_broker_zeroconf.py
+++ b/x2gobroker/tests/test_broker_zeroconf.py
@@ -77,12 +77,13 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase):
### TEST: select_profile() method
- def test_profileselection(self):
+ def test_sessionselection(self):
_output = {
- 'server': 'localhost:22',
+ 'server': 'localhost',
+ 'port': 22,
}
zeroconf_backend = x2gobroker.brokers.zeroconf_broker.X2GoBroker()
- self.assertEqual(zeroconf_backend.select_profile('profile_bar'), _output)
+ self.assertEqual(zeroconf_backend.select_session('profile_bar'), _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).
More information about the x2go-commits
mailing list