diff options
Diffstat (limited to 'spec/lib/gitlab/redis/workhorse_spec.rb')
-rw-r--r-- | spec/lib/gitlab/redis/workhorse_spec.rb | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/spec/lib/gitlab/redis/workhorse_spec.rb b/spec/lib/gitlab/redis/workhorse_spec.rb index 46931a6afcb..db5db18c732 100644 --- a/spec/lib/gitlab/redis/workhorse_spec.rb +++ b/spec/lib/gitlab/redis/workhorse_spec.rb @@ -2,43 +2,7 @@ require 'spec_helper' -RSpec.describe Gitlab::Redis::Workhorse, feature_category: :scalability do +RSpec.describe Gitlab::Redis::Workhorse, feature_category: :redis do include_examples "redis_new_instance_shared_examples", 'workhorse', Gitlab::Redis::SharedState include_examples "redis_shared_examples" - - describe '#pool' do - let(:config_new_format_host) { "spec/fixtures/config/redis_new_format_host.yml" } - let(:config_new_format_socket) { "spec/fixtures/config/redis_new_format_socket.yml" } - - subject { described_class.pool } - - before do - allow(described_class).to receive(:config_file_name).and_return(config_new_format_host) - - # Override rails root to avoid having our fixtures overwritten by `redis.yml` if it exists - allow(Gitlab::Redis::SharedState).to receive(:rails_root).and_return(mktmpdir) - allow(Gitlab::Redis::SharedState).to receive(:config_file_name).and_return(config_new_format_socket) - end - - around do |example| - clear_pool - example.run - ensure - clear_pool - end - - it 'instantiates an instance of MultiStore' do - subject.with do |redis_instance| - expect(redis_instance).to be_instance_of(::Gitlab::Redis::MultiStore) - - expect(redis_instance.primary_store.connection[:id]).to eq("redis://test-host:6379/99") - expect(redis_instance.secondary_store.connection[:id]).to eq("unix:///path/to/redis.sock/0") - - expect(redis_instance.instance_name).to eq('Workhorse') - end - end - - it_behaves_like 'multi store feature flags', :use_primary_and_secondary_stores_for_workhorse, - :use_primary_store_as_default_for_workhorse - end end |