From 8a4654c39eabd8de3e700c32c7e2b3c2fd613507 Mon Sep 17 00:00:00 2001 From: Igor Nikonov Date: Tue, 12 Sep 2023 18:06:00 +0000 Subject: [PATCH] Address review comment --- tests/ci/fast_test_check.py | 7 +++---- tests/ci/report.py | 4 ++++ tests/ci/stress_check.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py index 13dd6dcb5e2..7184a92d36f 100644 --- a/tests/ci/fast_test_check.py +++ b/tests/ci/fast_test_check.py @@ -146,7 +146,7 @@ def main(): run_log_path = logs_path / "run.log" timeout_expired = False - timeout = 90 * 60 + timeout = 1 * 60 with TeePopen(run_cmd, run_log_path, timeout=timeout) as process: retcode = process.wait() if process.timeout_exceeded: @@ -186,10 +186,9 @@ def main(): state, description, test_results, additional_logs = process_results(output_path) if timeout_expired: - test_result_name = "Check timeout expired" - test_results.append(TestResult(test_result_name, "FAIL", timeout)) + test_results.append(TestResult.create_check_timeout_expired(timeout)) state = "failure" - description = format_description(test_result_name) + description = format_description(test_results[-1].name) ch_helper = ClickHouseHelper() s3_path_prefix = os.path.join( diff --git a/tests/ci/report.py b/tests/ci/report.py index eb6e3bc1206..b93128262d9 100644 --- a/tests/ci/report.py +++ b/tests/ci/report.py @@ -249,6 +249,10 @@ class TestResult: assert file.exists(), file self.log_files.append(file) + @staticmethod + def create_check_timeout_expired(timeout : float) -> "TestResult": + return TestResult("Check timeout expired", "FAIL", timeout) + TestResults = List[TestResult] diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py index 4e79bdc769d..58453220b6c 100644 --- a/tests/ci/stress_check.py +++ b/tests/ci/stress_check.py @@ -175,7 +175,7 @@ def run_stress_test(docker_image_name): logging.info("Going to run stress test: %s", run_command) timeout_expired = False - timeout = 60 * 1 + timeout = 60 * 150 with TeePopen(run_command, run_log_path, timeout=timeout) as process: retcode = process.wait() if process.timeout_exceeded: