Skip to content

fix: extend wait timeout for test_delete_user() #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2021
Merged

fix: extend wait timeout for test_delete_user() #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tools/functional/api/test_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ def test_delete_user(gl, wait_for_sidekiq):
)

new_user.delete()
wait_for_sidekiq()
result = wait_for_sidekiq(timeout=60)
assert result == True, "sidekiq process should have terminated but did not"

assert new_user.id not in [user.id for user in gl.users.list()]

Expand Down
10 changes: 8 additions & 2 deletions tools/functional/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,15 @@ def wait_for_sidekiq(gl):

def _wait(timeout=30, step=0.5):
for _ in range(timeout):
if not gl.sidekiq.process_metrics()["processes"][0]["busy"]:
return
time.sleep(step)
busy = False
processes = gl.sidekiq.process_metrics()["processes"]
for process in processes:
if process["busy"]:
busy = True
if not busy:
return True
return False

return _wait

Expand Down