Repository navigation
Commit 3dde36e
fix: intermittent failure in test_merge_request_reset_approvals
Have been seeing intermittent failures in the test:
tests/functional/api/test_merge_requests.py::test_merge_request_reset_approvals
Also saw a failure in:
tests/functional/cli/test_cli_v4.py::test_accept_request_merge[subprocess]
Add a call to `wait_for_sidekiq()` to hopefully resolve the issues.1 parent 196538b commit 3dde36e
2 files changed
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -117,11 +117,12 @@ def test_merge_request_rebase(project): | |||
| 117 | 117 | assert mr.rebase() | |
| 118 | 118 | ||
| 119 | 119 | ||
| 120 | - def test_merge_request_reset_approvals(gitlab_url, project): | ||
| 120 | + def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq): | ||
| 121 | 121 | bot = project.access_tokens.create({"name": "bot", "scopes": ["api"]}) | |
| 122 | 122 | bot_gitlab = gitlab.Gitlab(gitlab_url, private_token=bot.token) | |
| 123 | 123 | bot_project = bot_gitlab.projects.get(project.id, lazy=True) | |
| 124 | 124 | ||
| 125 | + wait_for_sidekiq(timeout=60) | ||
| 125 | 126 | mr = bot_project.mergerequests.list()[0] | |
| 126 | 127 | assert mr.reset_approvals() | |
| 127 | 128 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -252,7 +252,7 @@ def test_create_merge_request(gitlab_cli, project): | |||
| 252 | 252 | assert ret.success | |
| 253 | 253 | ||
| 254 | 254 | ||
| 255 | - def test_accept_request_merge(gitlab_cli, project): | ||
| 255 | + def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq): | ||
| 256 | 256 | # MR needs at least 1 commit before we can merge | |
| 257 | 257 | mr = project.mergerequests.list()[0] | |
| 258 | 258 | file_data = { | |
@@ -263,6 +263,7 @@ def test_accept_request_merge(gitlab_cli, project): | |||
| 263 | 263 | } | |
| 264 | 264 | project.files.create(file_data) | |
| 265 | 265 | time.sleep(2) | |
| 266 | + wait_for_sidekiq(timeout=60) | ||
| 266 | 267 | ||
| 267 | 268 | cmd = [ | |
| 268 | 269 | "project-merge-request", | |
0 commit comments