diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 21:09:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 21:09:23 +0300 |
| commit | 76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4 (patch) | |
| tree | b5ca8e3a6b2cf93b67257b38ee71e2efee177700 /spec/spec_helper.rb | |
| parent | a210c43e0aca0311cc1d3d381763b25979ec72dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b862fc4bbd9..d379fd494fa 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -193,8 +193,10 @@ RSpec.configure do |config| # expect(Gitlab::Git::KeepAround).to receive(:execute).and_call_original allow(Gitlab::Git::KeepAround).to receive(:execute) - # Clear thread cache and Sidekiq queues - Gitlab::ThreadMemoryCache.cache_backend.clear + [Gitlab::ThreadMemoryCache, Gitlab::ProcessMemoryCache].each do |cache| + cache.cache_backend.clear + end + Sidekiq::Worker.clear_all # Temporary patch to force admin mode to be active by default in tests when |