Repository navigation
Commit fdd4114
chore: fix flaky test
1 parent 9b88132 commit fdd4114
1 file changed
Lines changed: 3 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -127,11 +127,10 @@ def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq): | |||
| 127 | 127 | assert mr.reset_approvals() | |
| 128 | 128 | ||
| 129 | 129 | ||
| 130 | - @pytest.mark.skip(reason="flaky test") | ||
| 131 | - def test_merge_request_merge(project): | ||
| 132 | - mr = project.mergerequests.list()[0] | ||
| 130 | + def test_merge_request_merge(project, merge_request, wait_for_sidekiq): | ||
| 131 | + mr = merge_request(source_branch="test_merge_request_merge") | ||
| 133 | 132 | mr.merge() | |
| 134 | - project.branches.delete(mr.source_branch) | ||
| 133 | + wait_for_sidekiq(timeout=60) | ||
| 135 | 134 | ||
| 136 | 135 | with pytest.raises(gitlab.GitlabMRClosedError): | |
| 137 | 136 | # Two merge attempts should raise GitlabMRClosedError | |
0 commit comments