more debugging and fix not_message handling

Author: strtgbb

ci/jobs/scripts/functional_tests_results.py

@@ -96,29 +96,31 @@ def test_is_known_fail(test_name, test_logs, known_broken_tests, test_options_st
     if not matching_rules:
         return False
 
-    def matches_field(field, log, is_regex):
-        if field is None:
-            return True
+    def matches_substring(substring, log, is_regex):
         if log is None:
             return False
         if is_regex:
-            return bool(field.search(log))
-        return field in log
+            return bool(substring.search(log))
+        return substring in log
 
     for rule_data in matching_rules:
         if rule_data.get("check_types") and not any(
             ct in test_options_string for ct in rule_data["check_types"]
         ):
-            print(f"Check types didn't match: {rule_data['check_types']} not in {test_options_string}")
+            print(
+                f"Check types didn't match: '{rule_data['check_types']}' not in '{test_options_string}'"
+            )
             continue  # check_types didn't match → skip rule
 
         is_regex = rule_data.get("regex", False)
-        if matches_field(rule_data.get("not_message"), test_logs, is_regex):
-            print(f"Not message matched: {rule_data['not_message']}")
+        not_message = rule_data.get("not_message")
+        if not_message and matches_substring(not_message, test_logs, is_regex):
+            print(f"Skip rule: Not message matched: '{rule_data['not_message']}'")
             continue  # not_message matched → skip rule
-        if not matches_field(rule_data.get("message"), test_logs, is_regex):
-            print(f"Message didn't match: {rule_data['message']}")
-            continue  # message didn't match → skip rule
+        message = rule_data.get("message")
+        if message and not matches_substring(message, test_logs, is_regex):
+            print(f"Skip rule: Message didn't match: '{rule_data['message']}'")
+            continue
 
         return rule_data["reason"]
 
@@ -247,7 +249,10 @@ def _process_test_output(self):
 
                 if test[1] == "FAIL":
                     broken_message = test_is_known_fail(
-                        test[0], test[3], known_broken_tests, test_options_string
+                        test[0],
+                        test_results_[-1].info,
+                        known_broken_tests,
+                        test_options_string,
                     )
 
                     if broken_message:

ci/jobs/scripts/integration_tests_runner.py

@@ -524,27 +524,30 @@ def test_is_known_fail(test_name, test_logs, debug_log_file):
             if not matching_rules:
                 return False
 
-            def matches_field(field, log, is_regex):
-                if field is None:
-                    return True
+            def matches_substring(substring, log, is_regex):
                 if log is None:
                     # Cannot match a message pattern if we have no logs
                     return False
                 if is_regex:
-                    return bool(field.search(log))
-                return field in log
+                    return bool(substring.search(log))
+                return substring in log
 
             for rule_data in matching_rules:
                 if rule_data.get("check_types") and not any(
                     ct in context_name for ct in rule_data["check_types"]
                 ):
-                    continue  # check_types didn't match → skip rule
+                    debug_log_file.write(f"Check types didn't match: '{rule_data['check_types']}' not in '{context_name}'\n")
+                    continue
 
                 is_regex = rule_data.get("regex", False)
-                if matches_field(rule_data.get("not_message"), test_logs, is_regex):
-                    continue  # not_message matched → skip rule
-                if not matches_field(rule_data.get("message"), test_logs, is_regex):
-                    continue  # message didn't match → skip rule
+                not_message = rule_data.get("not_message")
+                if not_message and matches_substring(not_message, test_logs, is_regex):
+                    debug_log_file.write(f"Skip rule: Not message matched: '{not_message}'\n")
+                    continue
+                message = rule_data.get("message")
+                if message and not matches_substring(message, test_logs, is_regex):
+                    debug_log_file.write(f"Skip rule: Message didn't match: '{message}'\n")
+                    continue
 
                 return rule_data["reason"]