Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb')
-rw-r--r--spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb18
1 files changed, 3 insertions, 15 deletions
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
index dbfab116479..5724c58f1a4 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
@@ -106,21 +106,9 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob,
end
context 'when TTL option is not set' do
- context 'when reduce_duplicate_job_key_ttl is enabled' do
- let(:expected_ttl) { described_class::SHORT_DUPLICATE_KEY_TTL }
+ let(:expected_ttl) { described_class::DEFAULT_DUPLICATE_KEY_TTL }
- it_behaves_like 'sets Redis keys with correct TTL'
- end
-
- context 'when reduce_duplicate_job_key_ttl is disabled' do
- before do
- stub_feature_flags(reduce_duplicate_job_key_ttl: false)
- end
-
- let(:expected_ttl) { described_class::DEFAULT_DUPLICATE_KEY_TTL }
-
- it_behaves_like 'sets Redis keys with correct TTL'
- end
+ it_behaves_like 'sets Redis keys with correct TTL'
end
context 'when TTL option is set' do
@@ -270,7 +258,7 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob,
}
end
- let(:argv) { ['main', 9, 'loc1', 'ci', nil, 'loc2'] }
+ let(:argv) { ['main', 9, 'loc1', 'ci', '', 'loc2'] }
it 'only updates the main connection' do
subject