Skip to content

Commit 0218337

Browse files
committed
Stateless tests: mark blacklisted tests as failed when they succeed
1 parent e00e972 commit 0218337

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

ci/jobs/scripts/functional_tests_results.py

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
# out = csv.writer(f, delimiter="\t")
2727
# out.writerow(status)
2828

29-
BROKEN_TESTS_ANALYZER_TECH_DEBT = [
30-
"01624_soft_constraints",
31-
]
32-
3329

3430
class FTResultsProcessor:
3531
@dataclasses.dataclass
@@ -50,7 +46,6 @@ def __init__(self, wd):
5046
self.tests_output_file = f"{wd}/test_result.txt"
5147
# self.test_results_parsed_file = f"{wd}/test_result.tsv"
5248
# self.status_file = f"{wd}/check_status.tsv"
53-
self.broken_tests = BROKEN_TESTS_ANALYZER_TECH_DEBT
5449

5550
def _process_test_output(self):
5651
total = 0
@@ -97,41 +92,20 @@ def _process_test_output(self):
9792

9893
total += 1
9994
if TIMEOUT_SIGN in line:
100-
if test_name in self.broken_tests:
101-
success += 1
102-
test_results.append((test_name, "BROKEN", test_time, []))
103-
else:
104-
failed += 1
105-
test_results.append((test_name, "Timeout", test_time, []))
95+
failed += 1
96+
test_results.append((test_name, "Timeout", test_time, []))
10697
elif FAIL_SIGN in line:
107-
if test_name in self.broken_tests:
108-
success += 1
109-
test_results.append((test_name, "BROKEN", test_time, []))
110-
else:
111-
failed += 1
112-
test_results.append((test_name, "FAIL", test_time, []))
98+
failed += 1
99+
test_results.append((test_name, "FAIL", test_time, []))
113100
elif UNKNOWN_SIGN in line:
114101
unknown += 1
115102
test_results.append((test_name, "FAIL", test_time, []))
116103
elif SKIPPED_SIGN in line:
117104
skipped += 1
118105
test_results.append((test_name, "SKIPPED", test_time, []))
119106
else:
120-
if OK_SIGN in line and test_name in self.broken_tests:
121-
skipped += 1
122-
test_results.append(
123-
(
124-
test_name,
125-
"NOT_FAILED",
126-
test_time,
127-
[
128-
"This test passed. Update analyzer_tech_debt.txt.\n"
129-
],
130-
)
131-
)
132-
else:
133-
success += int(OK_SIGN in line)
134-
test_results.append((test_name, "OK", test_time, []))
107+
success += int(OK_SIGN in line)
108+
test_results.append((test_name, "OK", test_time, []))
135109
test_end = False
136110
elif (
137111
len(test_results) > 0

tests/clickhouse-test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3318,6 +3318,8 @@ def main(args):
33183318
skip_list = []
33193319
blacklist_check = []
33203320

3321+
blacklist_check.extend(try_get_skip_list(base_dir, "../analyzer_tech_debt.txt"))
3322+
33213323
if args.no_parallel_replicas is True:
33223324
blacklist = try_get_skip_list(base_dir, "../parallel_replicas_blacklist.txt")
33233325
blacklist_check.extend(blacklist)

0 commit comments

Comments
 (0)