diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /qa/qa/support/waiter.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'qa/qa/support/waiter.rb')
-rw-r--r-- | qa/qa/support/waiter.rb | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/qa/qa/support/waiter.rb b/qa/qa/support/waiter.rb index 9ccc0d9484f..6dbbd197b01 100644 --- a/qa/qa/support/waiter.rb +++ b/qa/qa/support/waiter.rb @@ -7,20 +7,16 @@ module QA module_function - def wait_until(max_duration: singleton_class::DEFAULT_MAX_WAIT_TIME, reload_page: nil, sleep_interval: 0.1, raise_on_failure: true, retry_on_exception: false, log: true) - if log - QA::Runtime::Logger.debug( - <<~MSG.tr("\n", ' ') - with wait_until: max_duration: #{max_duration}; - reload_page: #{reload_page}; - sleep_interval: #{sleep_interval}; - raise_on_failure: #{raise_on_failure} - MSG - ) - end - + def wait_until( + max_duration: singleton_class::DEFAULT_MAX_WAIT_TIME, + reload_page: nil, + sleep_interval: 0.1, + raise_on_failure: true, + retry_on_exception: false, + log: true + ) result = nil - self.repeat_until( + repeat_until( max_duration: max_duration, reload_page: reload_page, sleep_interval: sleep_interval, @@ -30,7 +26,6 @@ module QA ) do result = yield end - QA::Runtime::Logger.debug("ended wait_until") if log result end |