mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-25 17:12:03 +00:00
sort tests in report by status
This commit is contained in:
parent
1deeca40db
commit
dde7ee29fc
@ -344,7 +344,7 @@ class CI:
|
||||
runner_type=Runners.FUNC_TESTER_ARM,
|
||||
),
|
||||
JobNames.STATELESS_TEST_OLD_ANALYZER_S3_REPLICATED_RELEASE: CommonJobConfigs.STATELESS_TEST.with_properties(
|
||||
required_builds=[BuildNames.PACKAGE_RELEASE], num_batches=4
|
||||
required_builds=[BuildNames.PACKAGE_RELEASE], num_batches=2
|
||||
),
|
||||
JobNames.STATELESS_TEST_S3_DEBUG: CommonJobConfigs.STATELESS_TEST.with_properties(
|
||||
required_builds=[BuildNames.PACKAGE_DEBUG], num_batches=1
|
||||
@ -354,7 +354,7 @@ class CI:
|
||||
),
|
||||
JobNames.STATELESS_TEST_S3_TSAN: CommonJobConfigs.STATELESS_TEST.with_properties(
|
||||
required_builds=[BuildNames.PACKAGE_TSAN],
|
||||
num_batches=4,
|
||||
num_batches=3,
|
||||
),
|
||||
JobNames.STRESS_TEST_DEBUG: CommonJobConfigs.STRESS_TEST.with_properties(
|
||||
required_builds=[BuildNames.PACKAGE_DEBUG],
|
||||
@ -403,14 +403,14 @@ class CI:
|
||||
),
|
||||
JobNames.INTEGRATION_TEST_ASAN_OLD_ANALYZER: CommonJobConfigs.INTEGRATION_TEST.with_properties(
|
||||
required_builds=[BuildNames.PACKAGE_ASAN],
|
||||
num_batches=3,
|
||||
num_batches=6,
|
||||
),
|
||||
JobNames.INTEGRATION_TEST_TSAN: CommonJobConfigs.INTEGRATION_TEST.with_properties(
|
||||
required_builds=[BuildNames.PACKAGE_TSAN], num_batches=6
|
||||
),
|
||||
JobNames.INTEGRATION_TEST_ARM: CommonJobConfigs.INTEGRATION_TEST.with_properties(
|
||||
required_builds=[BuildNames.PACKAGE_AARCH64],
|
||||
num_batches=3,
|
||||
num_batches=6,
|
||||
runner_type=Runners.FUNC_TESTER_ARM,
|
||||
),
|
||||
JobNames.INTEGRATION_TEST: CommonJobConfigs.INTEGRATION_TEST.with_properties(
|
||||
|
@ -29,7 +29,7 @@ from stopwatch import Stopwatch
|
||||
|
||||
import integration_tests_runner as runner
|
||||
from ci_config import CI
|
||||
from ci_utils import Utils, Shell
|
||||
from ci_utils import Utils
|
||||
|
||||
|
||||
def get_json_params_dict(
|
||||
|
@ -1070,7 +1070,8 @@ def handle_sigterm(signum, _frame):
|
||||
print(f"WARNING: Received signal {signum}")
|
||||
global timeout_expired
|
||||
timeout_expired = True
|
||||
runner_subprocess.send_signal(signal.SIGTERM)
|
||||
if runner_subprocess:
|
||||
runner_subprocess.send_signal(signal.SIGTERM)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
@ -742,10 +742,21 @@ def create_test_html_report(
|
||||
has_test_time = any(tr.time is not None for tr in test_results)
|
||||
has_log_urls = False
|
||||
|
||||
# Display entires with logs at the top (they correspond to failed tests)
|
||||
test_results.sort(
|
||||
key=lambda result: result.raw_logs is None and result.log_files is None
|
||||
)
|
||||
def sort_key(status):
|
||||
if "fail" in status.lower():
|
||||
return 0
|
||||
elif "error" in status.lower():
|
||||
return 1
|
||||
elif "not" in status.lower():
|
||||
return 2
|
||||
elif "ok" in status.lower():
|
||||
return 10
|
||||
elif "success" in status.lower():
|
||||
return 9
|
||||
else:
|
||||
return 5
|
||||
|
||||
test_results.sort(key=lambda result: sort_key(result.status))
|
||||
|
||||
for test_result in test_results:
|
||||
colspan = 0
|
||||
|
Loading…
Reference in New Issue
Block a user