diff options
| -rw-r--r-- | tools/functional/api/test_users.py | 3 | ||||
| -rw-r--r-- | tools/functional/conftest.py | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tools/functional/api/test_users.py b/tools/functional/api/test_users.py index 485829d..044831a 100644 --- a/tools/functional/api/test_users.py +++ b/tools/functional/api/test_users.py @@ -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()] diff --git a/tools/functional/conftest.py b/tools/functional/conftest.py index a0b14f9..648fe5e 100644 --- a/tools/functional/conftest.py +++ b/tools/functional/conftest.py @@ -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 |