diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
| commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
| tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /qa/qa/specs/helpers/quarantine.rb | |
| parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
| download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'qa/qa/specs/helpers/quarantine.rb')
| -rw-r--r-- | qa/qa/specs/helpers/quarantine.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/qa/specs/helpers/quarantine.rb b/qa/qa/specs/helpers/quarantine.rb index 738c99efb28..e58d70fdfb5 100644 --- a/qa/qa/specs/helpers/quarantine.rb +++ b/qa/qa/specs/helpers/quarantine.rb @@ -10,8 +10,10 @@ module QA extend self - # Skip tests in quarantine unless we explicitly focus on them. + # Skip tests in quarantine unless we explicitly focus on them or quarantine disabled def skip_or_run_quarantined_tests_or_contexts(example) + return if Runtime::Env.quarantine_disabled? + if filters.key?(:quarantine) included_filters = filters_other_than_quarantine |