diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 12:07:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 12:07:51 +0300 |
commit | 3ad11f24ca52d42694a8ce920a87ead6085d3f85 (patch) | |
tree | d5b664aafa7c2b65f470a700431d336d908c0ebc /spec/support/redis | |
parent | 62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/redis')
-rw-r--r-- | spec/support/redis/redis_shared_examples.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/redis/redis_shared_examples.rb b/spec/support/redis/redis_shared_examples.rb index 97a23f02b3e..e079c32d6ae 100644 --- a/spec/support/redis/redis_shared_examples.rb +++ b/spec/support/redis/redis_shared_examples.rb @@ -118,7 +118,7 @@ RSpec.shared_examples "redis_shared_examples" do context 'when running not on sidekiq workers' do before do - allow(Sidekiq).to receive(:server?).and_return(false) + allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(false) end it 'instantiates a connection pool with size 5' do @@ -130,7 +130,7 @@ RSpec.shared_examples "redis_shared_examples" do context 'when running on sidekiq workers' do before do - allow(Sidekiq).to receive(:server?).and_return(true) + allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true) allow(Sidekiq).to receive(:options).and_return({ concurrency: 18 }) end |