test: preserve required CI gate contracts after cancellation fix

Author: mikolalysenko

scripts/tests/test_ci_test_shard.py

@@ -131,7 +131,7 @@ def test_all_release_shards_are_required_and_use_the_matrix_size(self):
         verdict = workflow.split("\n  ci-ok:\n")[1]
         needs = re.search(r"^    needs: \[(.*)\]$", verdict, re.M)[1].split(", ")
         self.assertIn("test-release", needs)
-        self.assertIn("if: always()", verdict)
+        self.assertIn("if: ${{ always() && (github.event_name != 'pull_request' || !cancelled()) }}", verdict)
         self.assertIn('if v["result"] not in ("success", "skipped")', verdict)
 
 

scripts/tests/test_merge_queue_fail_fast.py

@@ -47,9 +47,11 @@ def test_no_job_tolerates_failure(self):
         # job, and this script would then cancel a run that could still land.
         self.assertIsNone(re.search(r"^\s*continue-on-error:", self.text, re.M))
 
-    def test_gate_runs_on_a_cancelled_run(self):
+    def test_gate_runs_on_a_cancelled_merge_group_run(self):
         gate = self.text[self.text.index("\n  ci-ok:"):]
-        self.assertRegex(gate, r"\n    if: always\(\)\n")
+        # Only PR cancellations can skip the verdict. The merge-queue
+        # watcher must still turn failed/cancelled dependencies into failure.
+        self.assertIn("\n    if: ${{ always() && (github.event_name != 'pull_request' || !cancelled()) }}\n", gate)
 
 
 if __name__ == "__main__":