summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-06-11 08:46:57 +1000
committerMark Lapierre <mlapierre@gitlab.com>2019-06-11 09:57:02 +1000
commit1dbc25e88642d0f1a6d688ff9aec2747c6c63264 (patch)
treed40380068e83475800baa08f42006bb33c80df96
parent20bb0d66f211da3828367004421eb15edd5ddb27 (diff)
downloadgitlab-ce-qa-ml-dry-retry-on-exception.tar.gz
DRY exception handlingqa-ml-dry-retry-on-exception
Use `retry_on_exception` instead of duplicating code
-rw-r--r--qa/qa/ce/strategy.rb11
1 files changed, 2 insertions, 9 deletions
diff --git a/qa/qa/ce/strategy.rb b/qa/qa/ce/strategy.rb
index 6c1820ffdc8..018a1eb1bfc 100644
--- a/qa/qa/ce/strategy.rb
+++ b/qa/qa/ce/strategy.rb
@@ -10,18 +10,11 @@ module QA
end
def perform_before_hooks
- retries ||= 0
-
# The login page could take some time to load the first time it is visited.
# We visit the login page and wait for it to properly load only once before the tests.
- QA::Runtime::Browser.visit(:gitlab, QA::Page::Main::Login)
- rescue QA::Page::Validatable::PageValidationError
- if (retries += 1) < 3
- Runtime::Logger.warn("The login page did not appear as expected. Retrying... (attempt ##{retries})")
- retry
+ QA::Support::Retrier.retry_on_exception do
+ QA::Runtime::Browser.visit(:gitlab, QA::Page::Main::Login)
end
-
- raise
end
end
end