Skip to content
Snippets Groups Projects
Commit 4c6b4621 authored by Tim Jaacks's avatar Tim Jaacks
Browse files

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.
parent dfc6204a
No related branches found
No related tags found
1 merge request!73wait_until_merge_status_is_set: always query merge request
Pipeline #8629 passed with stages
in 48 seconds
...@@ -99,6 +99,7 @@ def wait_until_merge_status_is_set(project: Project, mr: MergeRequest): ...@@ -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""" """Periodically query MR until GitLab has checked its merge status"""
print("Waiting until merge status has been checked", end="", flush=True) print("Waiting until merge status has been checked", end="", flush=True)
unchecked_states = ["unchecked", "checking", "cannot_be_merged_recheck"] 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: while mr.merge_status in unchecked_states:
print(".", end="", flush=True) print(".", end="", flush=True)
time.sleep(1) time.sleep(1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment