toto

conftest.py

@@ -97,7 +97,7 @@ def setup_host(hostname_or_ip):
         h.xo_server_add(h.user, h.password)
     else:
         h.xo_get_server_id(store=True)
-    wait_for(h.xo_server_connected, timeout_secs=100)
+    wait_for(h.xo_server_connected, timeout_secs=10)
     return h
 
 @pytest.fixture(scope='session')

lib/common.py

@@ -1,7 +1,6 @@
 import getpass
 import inspect
 import logging
-import socket
 import time
 import traceback
 from enum import Enum
@@ -30,7 +29,7 @@ def prefix_object_name(label):
         name_prefix = f"[{getpass.getuser()}]"
     return f"{name_prefix} {label}"
 
-def wait_for(fn, msg=None, timeout_secs=500, retry_delay_secs=2, invert=False):
+def wait_for(fn, msg=None, timeout_secs=120, retry_delay_secs=2, invert=False):
     if msg is not None:
         logging.info(msg)
     time_left = timeout_secs

lib/host.py

@@ -180,7 +180,6 @@ def xo_server_status(self):
         servers = xo_cli('server.getAll', use_json=True)
         for server in servers:
             if server['host'] == wrap_ip(self.hostname_or_ip):
-                logging.info("*** BRS: %s" % server['status'])
                 return server['status']
         return None