From bf068e728ff71acade8951fa4cd86878fd61000f Mon Sep 17 00:00:00 2001 From: Nuno Diegues Date: Tue, 8 Jun 2021 11:01:53 +0100 Subject: [PATCH] TUN-4504: Fix component tests in windows --- component-tests/test_logging.py | 2 +- component-tests/test_reconnect.py | 14 ++++++-------- component-tests/util.py | 5 ++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/component-tests/test_logging.py b/component-tests/test_logging.py index d464d5ca..69da0c88 100644 --- a/component-tests/test_logging.py +++ b/component-tests/test_logging.py @@ -7,7 +7,7 @@ from util import start_cloudflared, wait_tunnel_ready, send_requests # Rolling logger rotate log files after 1 MB rotate_after_size = 1000 * 1000 default_log_file = "cloudflared.log" -expect_message = "Starting Hello World server" +expect_message = "Starting Hello" def assert_log_to_terminal(cloudflared): diff --git a/component-tests/test_reconnect.py b/component-tests/test_reconnect.py index cf67aa25..5a0020f1 100644 --- a/component-tests/test_reconnect.py +++ b/component-tests/test_reconnect.py @@ -8,9 +8,9 @@ from util import start_cloudflared, wait_tunnel_ready, check_tunnel_not_connecte @flaky(max_runs=3, min_passes=1) -class TestReconnect(): +class TestReconnect: default_ha_conns = 4 - default_reconnect_secs = 5 + default_reconnect_secs = 15 extra_config = { "stdin-control": True, } @@ -36,7 +36,7 @@ class TestReconnect(): cloudflared.stdin.flush() def assert_reconnect(self, config, cloudflared, repeat): - wait_tunnel_ready(tunnel_url=config.get_url()) + wait_tunnel_ready(tunnel_url=config.get_url(), require_min_connections=self.default_ha_conns) for _ in range(repeat): for i in range(self.default_ha_conns): self.send_reconnect(cloudflared, self.default_reconnect_secs) @@ -44,11 +44,9 @@ class TestReconnect(): if expect_connections > 0: # Don't check if tunnel returns 200 here because there is a race condition between wait_tunnel_ready # retrying to get 200 response and reconnecting - wait_tunnel_ready( - require_min_connections=expect_connections) + wait_tunnel_ready(require_min_connections=expect_connections) else: check_tunnel_not_connected() - sleep(self.default_reconnect_secs + 10) - wait_tunnel_ready(tunnel_url=config.get_url(), - require_min_connections=self.default_ha_conns) + sleep(self.default_reconnect_secs * 2) + wait_tunnel_ready(tunnel_url=config.get_url(), require_min_connections=self.default_ha_conns) diff --git a/component-tests/util.py b/component-tests/util.py index bab43e71..a8731d9d 100644 --- a/component-tests/util.py +++ b/component-tests/util.py @@ -34,7 +34,7 @@ def cloudflared_cmd(config, config_path, cfd_args, cfd_pre_args, root): cmd += ["sudo"] cmd += [config.cloudflared_binary] cmd += cfd_pre_args - cmd += ["--config", config_path] + cmd += ["--config", str(config_path)] cmd += cfd_args LOGGER.info(f"Run cmd {cmd} with config {config}") return cmd @@ -50,8 +50,7 @@ def run_cloudflared_background(cmd, allow_input, capture_output): finally: cfd.terminate() if capture_output: - LOGGER.info( - f"cloudflared log: {cfd.stderr.read()}") + LOGGER.info(f"cloudflared log: {cfd.stderr.read()}") @retry(stop_max_attempt_number=MAX_RETRIES, wait_fixed=BACKOFF_SECS * 1000)