Skip to content

[CI] Filter explanations by test file at DB query time #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boomanaiden154 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[CI] Filter explanations by test file at DB query time #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7d7ac2
[𝘀𝗽𝗿] initial version
boomanaiden154 Dec 27, 2025
3b801fd
rebase
boomanaiden154 Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions premerge/advisor/advisor_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,12 @@ def _try_explain_failing_at_head(
) -> FailureExplanation | None:
query = (
"SELECT failure_message FROM failures "
"WHERE source_type='postcommit' AND platform=?"
"WHERE source_type='postcommit' AND platform=? AND test_file=?"
)
query_params = (
platform,
test_failure["name"],
)
query_params = (platform,)
if base_commit_index:
min_commit_index = (
base_commit_index - EXPLAINED_HEAD_MAX_COMMIT_INDEX_DIFFERENCE
Expand Down Expand Up @@ -175,8 +178,11 @@ def _try_explain_flaky_failure(
FailureExplanation object explaining the test failure.
"""
test_name_matches = db_connection.execute(
"SELECT failure_message, commit_index FROM failures WHERE source_type='postcommit' AND platform=?",
(platform,),
"SELECT failure_message, commit_index FROM failures WHERE source_type='postcommit' AND platform=? AND test_file=?",
(
platform,
test_failure["name"],
),
).fetchall()
commit_indices = []
for failure_message, commit_index in test_name_matches:
Expand Down
24 changes: 23 additions & 1 deletion premerge/advisor/advisor_lib_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,24 @@ def test_no_explain_different_message(self):
],
)

def test_no_explain_different_test_file(self):
self.assertListEqual(
self._get_explained_failures(prev_failure_failure_name="b.ll"),
[
{
"name": "a.ll",
"explained": False,
"reason": None,
}
],
)

def _setup_flaky_test_info(
self,
source_type="postcommit",
message="failed in way 1",
second_failure_sha="6269677375726269677375726269677375726269",
second_failure_test_file="a.ll",
):
failures_info = [
{
Expand All @@ -322,7 +335,7 @@ def _setup_flaky_test_info(
"base_commit_sha": second_failure_sha,
"source_id": "100001",
"failures": [
{"name": "a.ll", "message": message},
{"name": second_failure_test_file, "message": message},
],
"platform": "linux-x86_64",
},
Expand Down Expand Up @@ -401,6 +414,15 @@ def test_no_explain_flaky_small_range(self):
],
)

def test_no_explain_flaky_different_files(self):
self._setup_flaky_test_info(second_failure_test_file="b.ll")
self.assertEqual(
self._get_flaky_test_explanations(),
[
{"name": "a.ll", "explained": False, "reason": None},
],
)

def _setup_flaky_test_identification_info(self):
failures = []
# Setup a range of consistently failing tests that happen on sequential
Expand Down