diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh index f8dee0f8bc9..8202a07f017 100755 --- a/docker/test/stateful/run.sh +++ b/docker/test/stateful/run.sh @@ -123,7 +123,12 @@ function run_tests() export -f run_tests timeout "$MAX_RUN_TIME" bash -c run_tests ||: -./process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv +echo "Files in current directory" +ls -la ./ +echo "Files in root directory" +ls -la / + +/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server.log ||: diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh index 8827f5b1bf6..d6d9f189e89 100755 --- a/docker/test/stateless/run.sh +++ b/docker/test/stateless/run.sh @@ -115,7 +115,12 @@ export -f run_tests timeout "$MAX_RUN_TIME" bash -c run_tests ||: -./process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv +echo "Files in current directory" +ls -la ./ +echo "Files in root directory" +ls -la / + +/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv clickhouse-client -q "system flush logs" ||: diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py index a3ca357db18..fb157db31ba 100644 --- a/tests/ci/functional_test_check.py +++ b/tests/ci/functional_test_check.py @@ -94,7 +94,12 @@ def process_results(result_folder, server_log_path): additional_files = additional_files + [os.path.join(server_log_path, f) for f in server_log_files] status_path = os.path.join(result_folder, "check_status.tsv") - logging.info("Found test_results.tsv") + if os.path.exists(status_path): + logging.info("Found check_status.tsv") + else: + logging.info("Files in result folder %s", os.listdir(result_folder)) + raise Exception("File check_status.tsv not found") + with open(status_path, 'r', encoding='utf-8') as status_file: status = list(csv.reader(status_file, delimiter='\t')) @@ -103,6 +108,13 @@ def process_results(result_folder, server_log_path): state, description = status[0][0], status[0][1] results_path = os.path.join(result_folder, "test_results.tsv") + + if os.path.exists(results_path): + logging.info("Found test_results.tsv") + else: + logging.info("Files in result folder %s", os.listdir(result_folder)) + raise Exception("File test_results.tsv not found") + with open(results_path, 'r', encoding='utf-8') as results_file: test_results = list(csv.reader(results_file, delimiter='\t')) if len(test_results) == 0: