[𝘀𝗽𝗿] changes to main this commit is based on

Created using spr 1.3.7

[skip ci]

Author: boomanaiden154

premerge/advisor/advisor_lib.py

@@ -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
@@ -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:

premerge/advisor/advisor_lib_test.py

@@ -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 = [
             {
@@ -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",
             },
@@ -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