Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-01 12:11:45 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-01 12:11:45 +0300
commit3cb9e9a5070184e59cb6ff33a4ce381ed14a6fe5 (patch)
tree91b7c1440d1eb72ceb7a5fd4ea360f37e8b81f6d /qa
parent533ef6532ae5499b8ff2f886cbc677844c7b82e1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/merge_request/show.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 22bcad5994a..28f5d7b6998 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -201,7 +201,7 @@ module QA
def has_pipeline_status?(text)
# Pipelines can be slow, so we wait a bit longer than the usual 10 seconds
- wait_until(sleep_interval: 5, reload: false) do
+ wait_until(max_duration: 120, sleep_interval: 5, reload: true) do
has_element?(:merge_request_pipeline_info_content, text: text, wait: 15 )
end
end