From 161ee1df3ed262191f6c10eff9046f4ab62db8e6 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Fri, 25 Sep 2020 05:27:13 +0300 Subject: [PATCH 1/2] Fail more quickly in clickhouse-test if server does not respond --- tests/clickhouse-test | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/clickhouse-test b/tests/clickhouse-test index a3bed189d55..3f0c4bd155a 100755 --- a/tests/clickhouse-test +++ b/tests/clickhouse-test @@ -303,6 +303,14 @@ def run_tests_array(all_tests_with_params): clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE) clickhouse_proc.communicate("SELECT 'Running test {suite}/{case} from pid={pid}';".format(pid = os.getpid(), case = case, suite = suite)) + if clickhouse_proc.returncode != 0: + failures += 1 + print(MSG_FAIL, end='') + print_test_time(0) + print(" - server does not respond to health check") + SERVER_DIED = True + break + reference_file = os.path.join(suite_dir, name) + '.reference' stdout_file = os.path.join(suite_tmp_dir, name) + '.stdout' stderr_file = os.path.join(suite_tmp_dir, name) + '.stderr' From 049f21091e35f5dbff1182128bcafe154700e120 Mon Sep 17 00:00:00 2001 From: alexey-milovidov Date: Fri, 25 Sep 2020 08:05:50 +0300 Subject: [PATCH 2/2] Update clickhouse-test --- tests/clickhouse-test | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/clickhouse-test b/tests/clickhouse-test index 3f0c4bd155a..36467f18d55 100755 --- a/tests/clickhouse-test +++ b/tests/clickhouse-test @@ -305,9 +305,7 @@ def run_tests_array(all_tests_with_params): if clickhouse_proc.returncode != 0: failures += 1 - print(MSG_FAIL, end='') - print_test_time(0) - print(" - server does not respond to health check") + print("Server does not respond to health check") SERVER_DIED = True break