diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies')
-rw-r--r-- | spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed_spec.rb | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed_spec.rb index 963301bc001..ab9d14ad729 100644 --- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed_spec.rb @@ -23,8 +23,15 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::Strategies::UntilExecut end end + it 'deletes the lock even if an error occurs' do + expect(fake_duplicate_job).not_to receive(:scheduled?) + expect(fake_duplicate_job).to receive(:delete!).once + + perform_strategy_with_error + end + it 'does not reschedule the job even if deduplication happened' do - expect(fake_duplicate_job).to receive(:delete!) + expect(fake_duplicate_job).to receive(:delete!).once expect(fake_duplicate_job).not_to receive(:reschedule) strategy.perform({}) do @@ -33,16 +40,33 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::Strategies::UntilExecut end context 'when job is reschedulable' do - it 'reschedules the job if deduplication happened' do + before do allow(fake_duplicate_job).to receive(:should_reschedule?) { true } + end - expect(fake_duplicate_job).to receive(:delete!) + it 'reschedules the job if deduplication happened' do + expect(fake_duplicate_job).to receive(:delete!).once expect(fake_duplicate_job).to receive(:reschedule).once strategy.perform({}) do proc.call end end + + it 'does not reschedule the job if an error occurs' do + expect(fake_duplicate_job).to receive(:delete!).once + expect(fake_duplicate_job).not_to receive(:reschedule) + + perform_strategy_with_error + end + end + + def perform_strategy_with_error + expect do + strategy.perform({}) do + raise 'expected error' + end + end.to raise_error(RuntimeError, 'expected error') end end end |