From d9ea77e78991c269f228526c6868b1a6857bc91c Mon Sep 17 00:00:00 2001 From: BenjiReis Date: Thu, 28 Sep 2023 09:21:31 +0200 Subject: [PATCH] toto --- conftest.py | 2 +- lib/common.py | 3 +-- lib/host.py | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conftest.py b/conftest.py index ddd2c6273..28e282525 100644 --- a/conftest.py +++ b/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') diff --git a/lib/common.py b/lib/common.py index f9efc511d..27dc48582 100644 --- a/lib/common.py +++ b/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 diff --git a/lib/host.py b/lib/host.py index 9e2f772bb..db3bfd56f 100644 --- a/lib/host.py +++ b/lib/host.py @@ -178,7 +178,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