diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 21:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 21:10:04 +0300 |
commit | c3afdb42ddc7f24d51032ed0daef071a2dafdc93 (patch) | |
tree | 4bf3f4fed99d260370921dd2c222840012be14a3 /spec/lib/gitlab/redis | |
parent | 41aebff8ec728c167298aa44e037d8e324e00e8d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/redis')
-rw-r--r-- | spec/lib/gitlab/redis/cache_spec.rb | 15 | ||||
-rw-r--r-- | spec/lib/gitlab/redis/queues_spec.rb | 15 | ||||
-rw-r--r-- | spec/lib/gitlab/redis/shared_state_spec.rb | 15 | ||||
-rw-r--r-- | spec/lib/gitlab/redis/wrapper_spec.rb | 42 |
4 files changed, 11 insertions, 76 deletions
diff --git a/spec/lib/gitlab/redis/cache_spec.rb b/spec/lib/gitlab/redis/cache_spec.rb index 5f73b84288d..bc33bbe115a 100644 --- a/spec/lib/gitlab/redis/cache_spec.rb +++ b/spec/lib/gitlab/redis/cache_spec.rb @@ -3,20 +3,9 @@ require 'spec_helper' RSpec.describe Gitlab::Redis::Cache do - let(:config_file_name) { "config/redis.cache.yml" } + let(:instance_specific_config_file) { "config/redis.cache.yml" } let(:environment_config_file_name) { "GITLAB_REDIS_CACHE_CONFIG_FILE" } - let(:config_old_format_socket) { "spec/fixtures/config/redis_cache_old_format_socket.yml" } - let(:config_new_format_socket) { "spec/fixtures/config/redis_cache_new_format_socket.yml" } - let(:old_socket_path) {"/path/to/old/redis.cache.sock" } - let(:new_socket_path) {"/path/to/redis.cache.sock" } - let(:config_old_format_host) { "spec/fixtures/config/redis_cache_old_format_host.yml" } - let(:config_new_format_host) { "spec/fixtures/config/redis_cache_new_format_host.yml" } - let(:redis_port) { 6380 } - let(:redis_database) { 10 } - let(:sentinel_port) { redis_port + 20000 } - let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_cache_config_with_env.yml"} - let(:config_env_variable_url) {"TEST_GITLAB_REDIS_CACHE_URL"} - let(:class_redis_url) { Gitlab::Redis::Cache::DEFAULT_REDIS_CACHE_URL } + let(:class_redis_url) { 'redis://localhost:6380' } include_examples "redis_shared_examples" end diff --git a/spec/lib/gitlab/redis/queues_spec.rb b/spec/lib/gitlab/redis/queues_spec.rb index 8a32c991943..85fca9320cf 100644 --- a/spec/lib/gitlab/redis/queues_spec.rb +++ b/spec/lib/gitlab/redis/queues_spec.rb @@ -3,20 +3,9 @@ require 'spec_helper' RSpec.describe Gitlab::Redis::Queues do - let(:config_file_name) { "config/redis.queues.yml" } + let(:instance_specific_config_file) { "config/redis.queues.yml" } let(:environment_config_file_name) { "GITLAB_REDIS_QUEUES_CONFIG_FILE" } - let(:config_old_format_socket) { "spec/fixtures/config/redis_queues_old_format_socket.yml" } - let(:config_new_format_socket) { "spec/fixtures/config/redis_queues_new_format_socket.yml" } - let(:old_socket_path) {"/path/to/old/redis.queues.sock" } - let(:new_socket_path) {"/path/to/redis.queues.sock" } - let(:config_old_format_host) { "spec/fixtures/config/redis_queues_old_format_host.yml" } - let(:config_new_format_host) { "spec/fixtures/config/redis_queues_new_format_host.yml" } - let(:redis_port) { 6381 } - let(:redis_database) { 11 } - let(:sentinel_port) { redis_port + 20000 } - let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_queues_config_with_env.yml"} - let(:config_env_variable_url) {"TEST_GITLAB_REDIS_QUEUES_URL"} - let(:class_redis_url) { Gitlab::Redis::Queues::DEFAULT_REDIS_QUEUES_URL } + let(:class_redis_url) { 'redis://localhost:6381' } include_examples "redis_shared_examples" end diff --git a/spec/lib/gitlab/redis/shared_state_spec.rb b/spec/lib/gitlab/redis/shared_state_spec.rb index bd90e4c750d..2543c4d9678 100644 --- a/spec/lib/gitlab/redis/shared_state_spec.rb +++ b/spec/lib/gitlab/redis/shared_state_spec.rb @@ -3,20 +3,9 @@ require 'spec_helper' RSpec.describe Gitlab::Redis::SharedState do - let(:config_file_name) { "config/redis.shared_state.yml" } + let(:instance_specific_config_file) { "config/redis.shared_state.yml" } let(:environment_config_file_name) { "GITLAB_REDIS_SHARED_STATE_CONFIG_FILE" } - let(:config_old_format_socket) { "spec/fixtures/config/redis_shared_state_old_format_socket.yml" } - let(:config_new_format_socket) { "spec/fixtures/config/redis_shared_state_new_format_socket.yml" } - let(:old_socket_path) {"/path/to/old/redis.shared_state.sock" } - let(:new_socket_path) {"/path/to/redis.shared_state.sock" } - let(:config_old_format_host) { "spec/fixtures/config/redis_shared_state_old_format_host.yml" } - let(:config_new_format_host) { "spec/fixtures/config/redis_shared_state_new_format_host.yml" } - let(:redis_port) { 6382 } - let(:redis_database) { 12 } - let(:sentinel_port) { redis_port + 20000 } - let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_shared_state_config_with_env.yml"} - let(:config_env_variable_url) {"TEST_GITLAB_REDIS_SHARED_STATE_URL"} - let(:class_redis_url) { Gitlab::Redis::SharedState::DEFAULT_REDIS_SHARED_STATE_URL } + let(:class_redis_url) { 'redis://localhost:6382' } include_examples "redis_shared_examples" end diff --git a/spec/lib/gitlab/redis/wrapper_spec.rb b/spec/lib/gitlab/redis/wrapper_spec.rb index ec233c022ee..39156d06849 100644 --- a/spec/lib/gitlab/redis/wrapper_spec.rb +++ b/spec/lib/gitlab/redis/wrapper_spec.rb @@ -3,47 +3,15 @@ require 'spec_helper' RSpec.describe Gitlab::Redis::Wrapper do - let(:config_file_name) { "config/resque.yml" } - let(:environment_config_file_name) { "GITLAB_REDIS_CONFIG_FILE" } - let(:config_old_format_socket) { "spec/fixtures/config/redis_old_format_socket.yml" } - let(:config_new_format_socket) { "spec/fixtures/config/redis_new_format_socket.yml" } - let(:old_socket_path) {"/path/to/old/redis.sock" } - let(:new_socket_path) {"/path/to/redis.sock" } - let(:config_old_format_host) { "spec/fixtures/config/redis_old_format_host.yml" } - let(:config_new_format_host) { "spec/fixtures/config/redis_new_format_host.yml" } - let(:redis_port) { 6379 } - let(:redis_database) { 99 } - let(:sentinel_port) { redis_port + 20000 } - let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_config_with_env.yml"} - let(:config_env_variable_url) {"TEST_GITLAB_REDIS_URL"} - let(:class_redis_url) { Gitlab::Redis::Wrapper::DEFAULT_REDIS_URL } - - include_examples "redis_shared_examples" do - before do - allow(described_class).to receive(:instrumentation_class) do - ::Gitlab::Instrumentation::Redis::Cache - end - end - end - - describe '.version' do - it 'returns a version' do - expect(described_class.version).to be_present - end - end - describe '.instrumentation_class' do - it 'raises a NotImplementedError' do - expect(described_class).to receive(:instrumentation_class).and_call_original - - expect { described_class.instrumentation_class }.to raise_error(NotImplementedError) + it 'raises a NameError' do + expect { described_class.instrumentation_class }.to raise_error(NameError) end end - describe '.config_file_path' do - it 'returns the absolute path to the configuration file' do - expect(described_class.config_file_path('foo.yml')) - .to eq Rails.root.join('config', 'foo.yml').to_s + describe '.default_url' do + it 'is not implemented' do + expect { described_class.default_url }.to raise_error(NotImplementedError) end end end |