This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 59ab6cf0e9f78b93d541cd55697f1a922ffe602f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 6 06:08:38 2014 +0100 test_broker_agent.py: Add a test for mixed default SSH port and host-specific SSH port --- x2gobroker/tests/test_broker_agent.py | 59 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/x2gobroker/tests/test_broker_agent.py b/x2gobroker/tests/test_broker_agent.py index 6eefa02..22c83f1 100644 --- a/x2gobroker/tests/test_broker_agent.py +++ b/x2gobroker/tests/test_broker_agent.py @@ -114,8 +114,9 @@ broker-agent-query-mode = SSH [testprofile8] name = testprofile8 -host = docker-vm-0 (localhost), docker-vm-1 (localhost:22001), docker-vm-2 (localhost:22002) +host = docker-vm-0 (docker-server), docker-vm-1 (docker-server:22001), docker-vm-2 (docker-server:22002) sshport = 22000 +broker-agent-query-mode = SSH """ tf = tempfile.NamedTemporaryFile() @@ -193,10 +194,13 @@ sshport = 22000 _profile5['host'].sort() self.assertTrue( _profile5['host'][0] in ('host1.mydomain', 'host2.mydomain') ) self.assertTrue( not _profile5.has_key('status') ) - _remoteagent5 = inifile_backend.get_remote_agent('testprofile5') - self.assertTrue( _remoteagent5 == {u'hostname': '10.0.2.4', u'port': 22} or _remoteagent5 == {u'hostname': '10.0.2.5', u'port': 22} ) - _session5 = inifile_backend.select_session('testprofile5', 'foo5N') - self.assertTrue( _session5 == {'port': 22, 'server': '10.0.2.4', } or _session5 == {'port': 22, 'server': '10.0.2.5', } ) + i = 0 + while i < 10: + _remoteagent5 = inifile_backend.get_remote_agent('testprofile5') + self.assertTrue( _remoteagent5 == {u'hostname': '10.0.2.4', u'port': 22} or _remoteagent5 == {u'hostname': '10.0.2.5', u'port': 22} ) + _session5 = inifile_backend.select_session('testprofile5', 'foo5N') + self.assertTrue( _session5 == {'port': 22, 'server': '10.0.2.4', } or _session5 == {'port': 22, 'server': '10.0.2.5', } ) + i += 1 # test "testprofile6", test if canonical hostnames and real hostnames differ and the default # SSH port has been adapted @@ -216,31 +220,26 @@ sshport = 22000 _profile7['host'].sort() self.assertTrue( _profile7['host'][0] in ('docker-vm-1', 'docker-vm-2') ) self.assertTrue( not _profile7.has_key('status') ) - _remoteagent7 = inifile_backend.get_remote_agent('testprofile7') - self.assertTrue( _remoteagent7 == {u'hostname': 'docker-server', u'port': 22001} or _remoteagent7 == {u'hostname': 'docker-server', u'port': 22002} ) - _session7 = inifile_backend.select_session('testprofile7', 'foo7N') - self.assertTrue( _session7 == {'port': 22001, 'server': 'docker-server', } or _session7 == {'port': 22001, 'server': 'docker-server', } ) - -# # test "testprofile8" -# _profile8 = inifile_backend.get_profile('testprofile8') -# _profile8['host'].sort() -# self.assertTrue( ( _profile8['host'] == ['docker-vm-0', 'docker-vm-1', 'docker-vm-2'] ) ) -# self.assertTrue( _profile8.has_key('host=docker-vm-0') ) -# self.assertTrue( _profile8.has_key('host=docker-vm-1') ) -# self.assertTrue( _profile8.has_key('host=docker-vm-2') ) -# self.assertTrue( _profile8['host=docker-vm-0'] == 'localhost' ) -# self.assertTrue( _profile8['host=docker-vm-1'] == 'localhost' ) -# self.assertTrue( _profile8['host=docker-vm-2'] == 'localhost' ) -# self.assertTrue( _profile8['sshport'] == 22000 ) -# self.assertFalse( _profile8.has_key('sshport=docker-vm-0') ) -# self.assertTrue( _profile8['sshport=docker-vm-1'] == 22001 ) -# self.assertTrue( _profile8['sshport=docker-vm-2'] == 22002 ) -# i = 0 -# while i < 10: -# _session8 = inifile_backend.select_session('testprofile8', username='foo') -# self.assertTrue ( _session8['port'] in (22000, 22001, 22002) ) -# self.assertTrue ( _session8['server'] == 'localhost' ) -# i += 1 + i = 0 + while i < 10: + _remoteagent7 = inifile_backend.get_remote_agent('testprofile7') + self.assertTrue( _remoteagent7 == {u'hostname': 'docker-server', u'port': 22001} or _remoteagent7 == {u'hostname': 'docker-server', u'port': 22002} ) + _session7 = inifile_backend.select_session('testprofile7', 'foo7N') + self.assertTrue( _session7 == {'port': 22001, 'server': 'docker-server', } or _session7 == {'port': 22001, 'server': 'docker-server', } ) + i += 1 + + _list8 = inifile_backend.list_profiles(username='foo8N') + _profile8 = _list8['testprofile8'] + _profile8['host'].sort() + self.assertTrue( _profile8['host'][0] in ('docker-vm-0', 'docker-vm-1', 'docker-vm-2') ) + self.assertTrue( not _profile8.has_key('status') ) + i = 0 + while i < 10: + _remoteagent8 = inifile_backend.get_remote_agent('testprofile8') + self.assertTrue( _remoteagent8 == {u'hostname': 'docker-server', u'port': 22000} or _remoteagent8 == {u'hostname': 'docker-server', u'port': 22001} or _remoteagent8 == {u'hostname': 'docker-server', u'port': 22002} ) + _session8 = inifile_backend.select_session('testprofile8', 'foo8N') + self.assertTrue( _session8 == {'port': 22000, 'server': 'docker-server', } or _session8 == {'port': 22001, 'server': 'docker-server', } or _session8 == {'port': 22001, 'server': 'docker-server', } ) + i += 1 x2gobroker.agent._call_local_broker_agent = _save_local_broker_agent_call x2gobroker.agent._call_remote_broker_agent = _save_remote_broker_agent_call -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git