From 1720ac0fc6e7df4154da1f724a2ab7a1efcfe523 Mon Sep 17 00:00:00 2001 From: Nuno Diegues Date: Mon, 5 Apr 2021 09:56:35 +0100 Subject: [PATCH] TUN-4178: Fix component test for running as a service in MacOS to not assume a named tunnel --- component-tests/test_logging.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/component-tests/test_logging.py b/component-tests/test_logging.py index f8923425..dcee7989 100644 --- a/component-tests/test_logging.py +++ b/component-tests/test_logging.py @@ -7,21 +7,17 @@ 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 tunnel" +expect_message = "Starting Hello World server" def assert_log_to_terminal(cloudflared): - stderr = cloudflared.stderr.read(200) - # cloudflared logs the following when it first starts - # 2021-03-10T12:30:39Z INF Starting tunnel tunnelID= + stderr = cloudflared.stderr.read(1250) assert expect_message.encode() in stderr, f"{stderr} doesn't contain {expect_message}" def assert_log_in_file(file): with open(file, "r") as f: - log = f.read(200) - # cloudflared logs the following when it first starts - # {"level":"info","tunnelID":"","time":"2021-03-10T12:21:13Z","message":"Starting tunnel"} + log = f.read(1500) assert expect_message in log, f"{log} doesn't contain {expect_message}"