From 447016e65285c2c6ce9c7486a722aaf6137331c2 Mon Sep 17 00:00:00 2001 From: Molecule AI Core-DevOps Date: Thu, 14 May 2026 15:07:08 +0000 Subject: [PATCH] fix(ci): add missing push status to gitea-merge-queue test mocks Cherry-pick from main commit 0b47f951 (fix/1031-staging-test-fix): evaluate_merge_readiness() now requires "CI / all-required (push)" context in main_status.statuses[] before approving merge. The test mocks were still using empty statuses[], causing two tests to assert "merge" or "update" but get "pause" instead. Fixes the 2 failing tests on staging: - test_merge_decision_requires_main_green_pr_green_and_current_base - test_merge_decision_updates_stale_pr_before_merge Closes mc#1031. Co-Authored-By: Claude Opus 4.7 --- .gitea/scripts/tests/test_gitea_merge_queue.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitea/scripts/tests/test_gitea_merge_queue.py b/.gitea/scripts/tests/test_gitea_merge_queue.py index 6aeeb679..b01c6da2 100644 --- a/.gitea/scripts/tests/test_gitea_merge_queue.py +++ b/.gitea/scripts/tests/test_gitea_merge_queue.py @@ -85,7 +85,10 @@ def test_pr_needs_update_when_base_sha_absent_from_commits(): def test_merge_decision_requires_main_green_pr_green_and_current_base(): required = ["CI / all-required (pull_request)"] - main_status = {"state": "success", "statuses": []} + main_status = { + "state": "success", + "statuses": [{"context": "CI / all-required (push)", "status": "success"}], + } pr_status = { "state": "success", "statuses": [{"context": "CI / all-required (pull_request)", "status": "success"}], @@ -104,7 +107,10 @@ def test_merge_decision_requires_main_green_pr_green_and_current_base(): def test_merge_decision_updates_stale_pr_before_merge(): decision = mq.evaluate_merge_readiness( - main_status={"state": "success", "statuses": []}, + main_status={ + "state": "success", + "statuses": [{"context": "CI / all-required (push)", "status": "success"}], + }, pr_status={"state": "success", "statuses": [{"context": "CI / all-required (pull_request)", "status": "success"}]}, required_contexts=["CI / all-required (pull_request)"], pr_has_current_base=False, -- 2.52.0