chore: fix flaky test

python-gitlab · Oct 9, 2022 · fdd4114 · fdd4114
1 parent 9b88132
commit fdd4114
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py
@@ -127,11 +127,10 @@ def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq):
     assert mr.reset_approvals()
 
 
-@pytest.mark.skip(reason="flaky test")
-def test_merge_request_merge(project):
-    mr = project.mergerequests.list()[0]
+def test_merge_request_merge(project, merge_request, wait_for_sidekiq):
+    mr = merge_request(source_branch="test_merge_request_merge")
     mr.merge()
-    project.branches.delete(mr.source_branch)
+    wait_for_sidekiq(timeout=60)
 
     with pytest.raises(gitlab.GitlabMRClosedError):
         # Two merge attempts should raise GitlabMRClosedError