[X2Go-Commits] [x2gobroker] 01/02: Adapt tests to new load checker service feature.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 30 13:52:59 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 1fd09b17ac207e88eb83ac8a9a0e903c7c1f4982
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 30 13:51:54 2015 +0200

    Adapt tests to new load checker service feature.
---
 debian/changelog                        |    1 +
 x2gobroker/tests/test_broker_agent.py   |   14 +++++++-------
 x2gobroker/tests/test_broker_inifile.py |    4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc89706..14f3426 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -266,6 +266,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       X2GoBroker.get_profile_broker(), not via X2GoBroker.get_profile().
     - Various improvements / fixes for session selection via the load checker
       daemon.
+    - Adapt tests to new load checker service feature.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/x2gobroker/tests/test_broker_agent.py b/x2gobroker/tests/test_broker_agent.py
index 2aaa252..5220895 100644
--- a/x2gobroker/tests/test_broker_agent.py
+++ b/x2gobroker/tests/test_broker_agent.py
@@ -35,7 +35,7 @@ class TestX2GoBrokerAgent(unittest.TestCase):
         _save_portscan = x2gobroker.utils.portscan
         _save_time_sleep = time.sleep
 
-        def _call_testsuite_broker_agent(username, task, cmdline_args=[], remote_agent=None):
+        def _call_testsuite_broker_agent(username, task, cmdline_args=[], remote_agent=None, logger=None):
 
             if task == 'listsessions':
                 list_sessions = []
@@ -205,7 +205,7 @@ broker-agent-query-mode = SSH
         i = 0
         while i < 10:
             _remoteagent5 = inifile_backend.get_remote_agent('testprofile5')
-            self.assertTrue( _remoteagent5 == {u'hostname': 'host1.mydomain', u'hostaddr': '10.0.2.4', u'port': 22} or _remoteagent5 == {u'hostname': 'host2.mydomain', u'hostaddr': '10.0.2.5', u'port': 22} )
+            self.assertTrue( _remoteagent5 == {u'hostname': 'host1.mydomain', u'hostaddr': '10.0.2.4', u'port': 22, 'load_factors': {}, } or _remoteagent5 == {u'hostname': 'host2.mydomain', u'hostaddr': '10.0.2.5', u'port': 22, 'load_factors': {}, } )
             _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
@@ -219,7 +219,7 @@ broker-agent-query-mode = SSH
         self.assertTrue( _profile6['host'][0] in ('host1.mydomain', 'host2.mydomain') )
         self.assertTrue( not _profile6.has_key('status') )
         _remoteagent6 = inifile_backend.get_remote_agent('testprofile6')
-        self.assertTrue( _remoteagent6 == {u'hostname': 'host1.mydomain', u'hostaddr': '10.0.2.4', u'port': 23467} or _remoteagent6 == {u'hostname': 'host2.mydomain', u'hostaddr': '10.0.2.5', u'port': 23467} )
+        self.assertTrue( _remoteagent6 == {u'hostname': 'host1.mydomain', u'hostaddr': '10.0.2.4', u'port': 23467, 'load_factors': {}, } or _remoteagent6 == {u'hostname': 'host2.mydomain', u'hostaddr': '10.0.2.5', u'port': 23467, 'load_factors': {}, } )
         _session6 = inifile_backend.select_session('testprofile6', 'foo6N')
         self.assertTrue( _session6 == {'port': 23467, 'server': '10.0.2.4', } or _session6 == {'port': 23467, 'server': '10.0.2.5', } )
 
@@ -231,7 +231,7 @@ broker-agent-query-mode = SSH
         i = 0
         while i < 10:
             _remoteagent7 = inifile_backend.get_remote_agent('testprofile7')
-            self.assertTrue( _remoteagent7 == {u'hostname': 'docker-vm-1', u'hostaddr': 'docker-server', u'port': 22001} or _remoteagent7 == {u'hostname': 'docker-vm-2', u'hostaddr': 'docker-server', u'port': 22002} )
+            self.assertTrue( _remoteagent7 == {u'hostname': 'docker-vm-1', u'hostaddr': 'docker-server', u'port': 22001, 'load_factors': {}, } or _remoteagent7 == {u'hostname': 'docker-vm-2', u'hostaddr': 'docker-server', u'port': 22002, 'load_factors': {}, } )
             _session7 = inifile_backend.select_session('testprofile7', 'foo7N')
             self.assertTrue( _session7 == {'port': 22001, 'server': 'docker-server', } or _session7 == {'port': 22001, 'server': 'docker-server', } )
             i += 1
@@ -244,7 +244,7 @@ broker-agent-query-mode = SSH
         i = 0
         while i < 10:
             _remoteagent8 = inifile_backend.get_remote_agent('testprofile8')
-            self.assertTrue( _remoteagent8 == {u'hostname': 'docker-vm-0', u'hostaddr': 'docker-server', u'port': 22000} or _remoteagent8 == {u'hostname': 'docker-vm-1', u'hostaddr': 'docker-server', u'port': 22001} or _remoteagent8 == {u'hostname': 'docker-vm-2', u'hostaddr': 'docker-server', u'port': 22002} )
+            self.assertTrue( _remoteagent8 == {u'hostname': 'docker-vm-0', u'hostaddr': 'docker-server', u'port': 22000, 'load_factors': {}, } or _remoteagent8 == {u'hostname': 'docker-vm-1', u'hostaddr': 'docker-server', u'port': 22001, 'load_factors': {}, } or _remoteagent8 == {u'hostname': 'docker-vm-2', u'hostaddr': 'docker-server', u'port': 22002, 'load_factors': {}, } )
             _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
@@ -262,7 +262,7 @@ broker-agent-query-mode = SSH
         _save_time_sleep = time.sleep
         self.tbarwos_session_suspended = False
 
-        def _call_testsuite_broker_agent(username, task, cmdline_args=[], remote_agent=None):
+        def _call_testsuite_broker_agent(username, task, cmdline_args=[], remote_agent=None, logger=None):
 
             if task == 'listsessions':
                 list_sessions = []
@@ -438,7 +438,7 @@ broker-autologin = true
         _save_remote_broker_agent_call = x2gobroker.agent._call_remote_broker_agent
         _save_portscan = x2gobroker.utils.portscan
 
-        def _call_testsuite_broker_agent(username, task, cmdline_args=[], remote_agent=None):
+        def _call_testsuite_broker_agent(username, task, cmdline_args=[], remote_agent=None, logger=None):
 
             if task == 'ping':
                 return True, []
diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py
index 27e48c9..6cdff67 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), 2)
-        _expected_profile_ids = [ "localhost-kde", "localhost-mate", ]
+        self.assertEqual(len(_profile_ids), 3)
+        _expected_profile_ids = [ "localhost-kde", "localhost-mate", "localhost-shadow", ]
         for _id in _profile_ids:
             self.assertTrue( ( _id in _expected_profile_ids ) )
         for _id in _expected_profile_ids:

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list