diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-17 18:13:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-17 18:13:39 +0300 |
commit | e303f963d0f03d9e2d21654700b56377701374b0 (patch) | |
tree | c83151e601848d47edf16a5fbd3dcee4d0a21b38 /spec/support/redis | |
parent | 5d92a0af93588db9c6bef9ab5d81b73daebc782a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/redis')
-rw-r--r-- | spec/support/redis/redis_helpers.rb | 7 | ||||
-rw-r--r-- | spec/support/redis/redis_new_instance_shared_examples.rb | 4 | ||||
-rw-r--r-- | spec/support/redis/redis_shared_examples.rb | 10 |
3 files changed, 11 insertions, 10 deletions
diff --git a/spec/support/redis/redis_helpers.rb b/spec/support/redis/redis_helpers.rb index f27d873eb31..90c15dea1f8 100644 --- a/spec/support/redis/redis_helpers.rb +++ b/spec/support/redis/redis_helpers.rb @@ -32,4 +32,11 @@ module RedisHelpers def redis_sessions_cleanup! Gitlab::Redis::Sessions.with(&:flushdb) end + + # Usage: reset cached instance config + def redis_clear_raw_config!(instance_class) + instance_class.remove_instance_variable(:@_raw_config) + rescue NameError + # raised if @_raw_config was not set; ignore + end end diff --git a/spec/support/redis/redis_new_instance_shared_examples.rb b/spec/support/redis/redis_new_instance_shared_examples.rb index ede517bfaff..943fe0f11ba 100644 --- a/spec/support/redis/redis_new_instance_shared_examples.rb +++ b/spec/support/redis/redis_new_instance_shared_examples.rb @@ -8,13 +8,13 @@ RSpec.shared_examples "redis_new_instance_shared_examples" do |name, fallback_cl let(:fallback_config_file) { nil } before do - fallback_class.remove_instance_variable(:@_raw_config) rescue nil + redis_clear_raw_config!(fallback_class) allow(fallback_class).to receive(:config_file_name).and_return(fallback_config_file) end after do - fallback_class.remove_instance_variable(:@_raw_config) rescue nil + redis_clear_raw_config!(fallback_class) end it_behaves_like "redis_shared_examples" diff --git a/spec/support/redis/redis_shared_examples.rb b/spec/support/redis/redis_shared_examples.rb index 4bee845453d..d4c8682ec71 100644 --- a/spec/support/redis/redis_shared_examples.rb +++ b/spec/support/redis/redis_shared_examples.rb @@ -20,11 +20,11 @@ RSpec.shared_examples "redis_shared_examples" do before do allow(described_class).to receive(:config_file_name).and_return(Rails.root.join(config_file_name).to_s) - clear_raw_config + redis_clear_raw_config!(described_class) end after do - clear_raw_config + redis_clear_raw_config!(described_class) end describe '.config_file_name' do @@ -399,12 +399,6 @@ RSpec.shared_examples "redis_shared_examples" do end end - def clear_raw_config - described_class.remove_instance_variable(:@_raw_config) - rescue NameError - # raised if @_raw_config was not set; ignore - end - def clear_pool described_class.remove_instance_variable(:@pool) rescue NameError |