diff options
| author | John L. Villalovos <john@sodarock.com> | 2022-10-04 19:51:17 -0700 |
|---|---|---|
| committer | Nejc Habjan <hab.nejc@gmail.com> | 2022-10-05 13:49:27 +0200 |
| commit | 3dde36eab40406948adca633f7197beb32b29552 (patch) | |
| tree | 07614adcad618a25573540763108dc7eb108581e /tests/functional | |
| parent | 196538ba3e233ba2acf6f816f436888ba4b1f52a (diff) | |
| download | gitlab-3dde36eab40406948adca633f7197beb32b29552.tar.gz | |
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.
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/api/test_merge_requests.py | 3 | ||||
| -rw-r--r-- | tests/functional/cli/test_cli_v4.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py index 114f4ff..a79c65b 100644 --- a/tests/functional/api/test_merge_requests.py +++ b/tests/functional/api/test_merge_requests.py @@ -117,11 +117,12 @@ def test_merge_request_rebase(project): assert mr.rebase() -def test_merge_request_reset_approvals(gitlab_url, project): +def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq): bot = project.access_tokens.create({"name": "bot", "scopes": ["api"]}) bot_gitlab = gitlab.Gitlab(gitlab_url, private_token=bot.token) bot_project = bot_gitlab.projects.get(project.id, lazy=True) + wait_for_sidekiq(timeout=60) mr = bot_project.mergerequests.list()[0] assert mr.reset_approvals() diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py index 62b893b..921aa78 100644 --- a/tests/functional/cli/test_cli_v4.py +++ b/tests/functional/cli/test_cli_v4.py @@ -252,7 +252,7 @@ def test_create_merge_request(gitlab_cli, project): assert ret.success -def test_accept_request_merge(gitlab_cli, project): +def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq): # MR needs at least 1 commit before we can merge mr = project.mergerequests.list()[0] file_data = { @@ -263,6 +263,7 @@ def test_accept_request_merge(gitlab_cli, project): } project.files.create(file_data) time.sleep(2) + wait_for_sidekiq(timeout=60) cmd = [ "project-merge-request", |