From 4c6b46212830fe936c684866f096ba63946f95b7 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Fri, 17 Dec 2021 22:40:27 +0100
Subject: [PATCH] wait_until_merge_status_is_set: always query merge request
The function used to rely on the given merge request object without
checking its current state. If the given object was not in one of the
"unchecked" states, it returned immediately. The state, however, could
have changed between its last query and the call of this function, so
it now checks the state first before deciding anything.
---
common.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/common.py b/common.py
index f716d68..8487836 100755
--- a/common.py
+++ b/common.py
@@ -99,6 +99,7 @@ def wait_until_merge_status_is_set(project: Project, mr: MergeRequest):
"""Periodically query MR until GitLab has checked its merge status"""
print("Waiting until merge status has been checked", end="", flush=True)
unchecked_states = ["unchecked", "checking", "cannot_be_merged_recheck"]
+ mr = project.mergerequests.get(mr.iid, retry_transient_errors=True)
while mr.merge_status in unchecked_states:
print(".", end="", flush=True)
time.sleep(1)
--
GitLab