Skip to content

Commit 591b199

Browse files
authored
Merge pull request #1170 from Altinity/fix-integ-crossout-25.8
25.8 Fix integ crossout
2 parents f5fb292 + 8126097 commit 591b199

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

ci/jobs/scripts/integration_tests_runner.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,13 @@ def matches_substring(substring, log, is_regex):
583583
test_logs = extract_fail_logs(log_path)
584584
test_log = test_logs.get(failed_test.split("::")[-1])
585585
if test_log is None:
586+
# Log extraction can fail if the fail was in the teardown
586587
log_file.write(
587-
f"WARNING: Test '{failed_test}' has no logs among {test_logs.keys()}\n"
588+
f"WARNING: Test '{failed_test}' has no logs among {list(test_logs.keys())}, assuming log extraction failed, proceeding with full log\n"
588589
)
590+
with open(log_path, "r", encoding="utf-8") as f:
591+
test_log = f.read()
592+
589593
known_fail_reason = test_is_known_fail(
590594
failed_test, test_log, log_file
591595
)

tests/broken_tests.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,21 @@
5757
message: result differs with reference
5858
check_types:
5959
- msan
60+
- name: 00024_random_counters
61+
reason: INVESTIGATE - random timeout
62+
message: Timeout! Killing process group
63+
- name: test_storage_s3_queue/test_5.py::test_migration[1-s3queue_]
64+
reason: KNOWN - Sometimes fails due to test order
65+
message: 'Failed: Timeout >900.0s'
66+
- name: test_storage_s3_queue/test_5.py::test_migration[3-s3queue_]
67+
reason: KNOWN - Sometimes fails due to test order
68+
message: 'Failed: Timeout >900.0s'
69+
- name: test_storage_s3_queue/test_5.py::test_migration[1-]
70+
reason: KNOWN - Sometimes fails due to test order
71+
message: 'Failed: Timeout >900.0s'
72+
- name: test_storage_s3_queue/test_5.py::test_migration[3-]
73+
reason: KNOWN - Sometimes fails due to test order
74+
message: 'Failed: Timeout >900.0s'
6075
- name: test_scheduler_cpu_preemptive/test.py::test_downscaling[cpu-slot-preemption-timeout-1ms]
6176
reason: INVESTIGATE - Unstable on tsan, asan
6277
message: 'Failed: Timeout >900.0s'
@@ -88,6 +103,12 @@
88103
reason: 'KNOWN - Unstable upstream'
89104
- name: test_storage_s3_queue/test_2.py::test_shards_distributed[unordered-1]
90105
reason: 'KNOWN - Unstable upstream'
106+
- name: test_storage_s3_queue/test_2.py::test_shards_distributed[unordered-8]
107+
reason: 'KNOWN - Unstable upstream'
108+
- name: test_storage_s3_queue/test_2.py::test_shards_distributed[ordered-1]
109+
reason: 'KNOWN - Unstable upstream'
110+
- name: test_storage_s3_queue/test_2.py::test_shards_distributed[ordered-2]
111+
reason: 'KNOWN - Unstable upstream'
91112
- name: test_storage_s3_queue/test_4.py::test_list_and_delete_race
92113
reason: 'KNOWN - Unstable upstream'
93114
message: AssertionError
@@ -163,7 +184,7 @@
163184
|Timeout exceeded while receiving data from server\.
164185
|DB::Exception: Estimated query execution time \((\d+\.\d+) seconds\) is too long\.
165186
|curl: \(28\) Operation timed out'
166-
not_message: 'Sanitizer trap'
187+
not_message: 'Sanitizer trap|Sanitizer assert'
167188
regex: true
168189
check_types:
169190
- tsan

0 commit comments

Comments
 (0)