Skip to content

Commit 2248cd0

Browse files
Bug 2010080 - ignore 'finished in XYZms' in failure line for check if error is new (#9161)
1 parent 670e779 commit 2248cd0

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

tests/model/test_error_summary.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import pytest
22

33
from treeherder.model.error_summary import (
4+
cache_clean_error_line,
45
get_cleaned_line,
56
get_crash_signature,
67
get_error_search_term_and_path,
@@ -353,3 +354,25 @@ def test_get_blacklisted_search_term(line, exp_search_info):
353354
"""Test search term extraction for lines that contain a blacklisted term"""
354355
actual_search_info = get_error_search_term_and_path(line)
355356
assert actual_search_info == exp_search_info
357+
358+
359+
LINES_TO_CACHE_TEST_CASES = (
360+
(
361+
"TEST-UNEXPECT-FAIL | test_drag_1digit.html | offset 21.45 pixel is over limit.",
362+
"TEST-UNEXPECT-FAIL | test_drag_1digit.html | offset X pixel is over limit.",
363+
),
364+
(
365+
"TEST-UNEXPECT-FAIL | test_drag_nodigit.html | offset 81px is over limit.",
366+
"TEST-UNEXPECT-FAIL | test_drag_nodigit.html | offset 81px is over limit.",
367+
),
368+
(
369+
"TEST-UNEXPECT-FAIL | test_complete.html | finished in 617ms.",
370+
"TEST-UNEXPECT-FAIL | test_complete.html | finished.",
371+
),
372+
)
373+
374+
375+
@pytest.mark.parametrize(("line", "exp_cache_line_cleaned"), LINES_TO_CACHE_TEST_CASES)
376+
def test_cache_error_line_cleaning(line, exp_cache_line_cleaned):
377+
actual_cache_line_cleaned = cache_clean_error_line(line)
378+
assert actual_cache_line_cleaned == exp_cache_line_cleaned

treeherder/model/error_summary.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ def cache_clean_error_line(line):
316316
cache_clean_line = re.sub(
317317
r" http://localhost:[0-9]+/", " http://localhost:X/", cache_clean_line
318318
)
319+
cache_clean_line = re.sub(r" finished in \d+ms", " finished", cache_clean_line)
319320
return cache_clean_line
320321

321322

0 commit comments

Comments
 (0)