Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3dde36e

Browse files
JohnVillalovosnejch
authored andcommitted
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_approvalsAlso 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 parent196538b commit3dde36e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎tests/functional/api/test_merge_requests.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,12 @@ def test_merge_request_rebase(project):
117117
assertmr.rebase()
118118

119119

120-
deftest_merge_request_reset_approvals(gitlab_url,project):
120+
deftest_merge_request_reset_approvals(gitlab_url,project,wait_for_sidekiq):
121121
bot=project.access_tokens.create({"name":"bot","scopes": ["api"]})
122122
bot_gitlab=gitlab.Gitlab(gitlab_url,private_token=bot.token)
123123
bot_project=bot_gitlab.projects.get(project.id,lazy=True)
124124

125+
wait_for_sidekiq(timeout=60)
125126
mr=bot_project.mergerequests.list()[0]
126127
assertmr.reset_approvals()
127128

‎tests/functional/cli/test_cli_v4.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ def test_create_merge_request(gitlab_cli, project):
252252
assertret.success
253253

254254

255-
deftest_accept_request_merge(gitlab_cli,project):
255+
deftest_accept_request_merge(gitlab_cli,project,wait_for_sidekiq):
256256
# MR needs at least 1 commit before we can merge
257257
mr=project.mergerequests.list()[0]
258258
file_data= {
@@ -263,6 +263,7 @@ def test_accept_request_merge(gitlab_cli, project):
263263
}
264264
project.files.create(file_data)
265265
time.sleep(2)
266+
wait_for_sidekiq(timeout=60)
266267

267268
cmd= [
268269
"project-merge-request",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp