introduce is_allowed_verdict_for_testcase

RagnarGrootKoerkamp · thorehusfeldt · Sep 8, 2023 · Sep 10, 2023 · Sep 10, 2023 · Sep 10, 2023
commit c7bbef255c108a2ef4e2ed47223bc1c2f3692e20
diff --git a/bin/expectations.py b/bin/expectations.py
@@ -176,11 +176,19 @@ def parse_expectations(pattern, expectations):
 
         parse_expectations("", expectations)
 
-    def is_allowed_verdict(self, verdict: str, path=""):
+    def allowed_verdicts_for_testcase(self, path) -> dict[str, str]:
+        """Returns a dictionary over the patterns that apply for the given test case path"""
+        return {
+            pattern: verdicts
+            for pattern, verdicts in self._allowed_verdicts.items()
+            if path.startswith(pattern)
+        }
+
+    def is_allowed_verdict(self, verdict: str, path):
         """Is the result allowed for the testcase at the given path?"""
         verdict = shortform(verdict)
-        for pattern, allowed in self._allowed_verdicts.items():
-            if path.startswith(pattern) and verdict not in allowed:
+        for _, verdicts in self.allowed_verdicts_for_testcase(path).items():
+            if verdict not in verdicts:
                 return False
         return True
 

diff --git a/...uisition/submissions/accepted/th-wa-as.py → ...nquisition/submissions/accepted/bad-wa.py b/...uisition/submissions/accepted/th-wa-as.py → ...nquisition/submissions/accepted/bad-wa.py
diff --git a/...isition/submissions/wrong_answer/th-ac.py → ...sition/submissions/wrong_answer/bad-ac.py b/...isition/submissions/wrong_answer/th-ac.py → ...sition/submissions/wrong_answer/bad-ac.py
diff --git a/...on/submissions/wrong_more_precise/five.py → ...wrong_answer_but_ac_on_sample/bad-five.py b/...on/submissions/wrong_more_precise/five.py → ...wrong_answer_but_ac_on_sample/bad-five.py
diff --git a/...ion/submissions/wrong_more_precise/two.py → ...ions/wrong_answer_but_ac_on_sample/two.py b/...ion/submissions/wrong_more_precise/two.py → ...ions/wrong_answer_but_ac_on_sample/two.py