curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-4504: Fix component tests in windows

This commit is contained in:
Nuno Diegues 2021-06-08 11:01:53 +01:00
parent f88732277a
commit bf068e728f
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
component-tests/test_logging.py
View File

@ -7,7 +7,7 @@ from util import start_cloudflared, wait_tunnel_ready, send_requests
# Rolling logger rotate log files after 1 MB # Rolling logger rotate log files after 1 MB
rotate_after_size = 1000 * 1000 rotate_after_size = 1000 * 1000
default_log_file = "cloudflared.log" default_log_file = "cloudflared.log"
expect_message = "Starting Hello World server" expect_message = "Starting Hello"
def assert_log_to_terminal(cloudflared): def assert_log_to_terminal(cloudflared):

14
component-tests/test_reconnect.py
View File

@ -8,9 +8,9 @@ from util import start_cloudflared, wait_tunnel_ready, check_tunnel_not_connecte
@flaky(max_runs=3, min_passes=1) @flaky(max_runs=3, min_passes=1)
class TestReconnect(): class TestReconnect:
default_ha_conns = 4 default_ha_conns = 4
default_reconnect_secs = 5 default_reconnect_secs = 15
extra_config = { extra_config = {
"stdin-control": True, "stdin-control": True,
} }
@ -36,7 +36,7 @@ class TestReconnect():
cloudflared.stdin.flush() cloudflared.stdin.flush()
def assert_reconnect(self, config, cloudflared, repeat): 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 _ in range(repeat):
for i in range(self.default_ha_conns): for i in range(self.default_ha_conns):
self.send_reconnect(cloudflared, self.default_reconnect_secs) self.send_reconnect(cloudflared, self.default_reconnect_secs)
@ -44,11 +44,9 @@ class TestReconnect():
if expect_connections > 0: if expect_connections > 0:
# Don't check if tunnel returns 200 here because there is a race condition between wait_tunnel_ready # 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 # retrying to get 200 response and reconnecting
wait_tunnel_ready( wait_tunnel_ready(require_min_connections=expect_connections)
require_min_connections=expect_connections)
else: else:
check_tunnel_not_connected() check_tunnel_not_connected()
sleep(self.default_reconnect_secs + 10) sleep(self.default_reconnect_secs * 2)
wait_tunnel_ready(tunnel_url=config.get_url(), wait_tunnel_ready(tunnel_url=config.get_url(), require_min_connections=self.default_ha_conns)
require_min_connections=self.default_ha_conns)

5
component-tests/util.py
View File

@ -34,7 +34,7 @@ def cloudflared_cmd(config, config_path, cfd_args, cfd_pre_args, root):
cmd += ["sudo"] cmd += ["sudo"]
cmd += [config.cloudflared_binary] cmd += [config.cloudflared_binary]
cmd += cfd_pre_args cmd += cfd_pre_args
cmd += ["--config", config_path] cmd += ["--config", str(config_path)]
cmd += cfd_args cmd += cfd_args
LOGGER.info(f"Run cmd {cmd} with config {config}") LOGGER.info(f"Run cmd {cmd} with config {config}")
return cmd return cmd
@ -50,8 +50,7 @@ def run_cloudflared_background(cmd, allow_input, capture_output):
finally: finally:
cfd.terminate() cfd.terminate()
if capture_output: if capture_output:
LOGGER.info( LOGGER.info(f"cloudflared log: {cfd.stderr.read()}")
f"cloudflared log: {cfd.stderr.read()}")
@retry(stop_max_attempt_number=MAX_RETRIES, wait_fixed=BACKOFF_SECS * 1000) @retry(stop_max_attempt_number=MAX_RETRIES, wait_fixed=BACKOFF_SECS * 1000)