diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 13:07:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 13:07:47 +0300 |
commit | d670c3006e6e44901bce0d53cc4768d1d80ffa92 (patch) | |
tree | 8f65743c232e5b76850c4cc264ba15e1185815ff /spec/spec_helper.rb | |
parent | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9a2eee0edc5..31ff619232c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -346,6 +346,15 @@ RSpec.configure do |config| Gitlab::WithRequestStore.with_request_store { example.run } end + # previous test runs may have left some resources throttled + config.before do + ::Gitlab::ExclusiveLease.reset_all!("el:throttle:*") + end + + config.before(:example, :assume_throttled) do |example| + allow(::Gitlab::ExclusiveLease).to receive(:throttle).and_return(nil) + end + config.before(:example, :request_store) do # Clear request store before actually starting the spec (the # `around` above will have the request store enabled for all |