diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 06:07:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 06:07:43 +0300 |
commit | dddde902acfa6acfb11583c61faa67cc7c8d11b6 (patch) | |
tree | 2e9fdf963c84f82995d62d0c55f91168cff3ec47 /spec/lib/gitlab/sidekiq_middleware | |
parent | 101c30f4dffc624af3cbe3f12edc2cfee570a5f3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/sidekiq_middleware')
-rw-r--r-- | spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb index b6e47afc7e8..9c7f6638913 100644 --- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb @@ -30,5 +30,15 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::Client, :clean_gitlab_redis_q expect(job2['duplicate-of']).to be_nil expect(job3['duplicate-of']).to eq(job1['jid']) end + + it "does not mark a job that's scheduled in the future as a duplicate" do + TestDeduplicationWorker.perform_async('args1') + TestDeduplicationWorker.perform_at(1.day.from_now, 'args1') + TestDeduplicationWorker.perform_in(3.hours, 'args1') + + duplicates = TestDeduplicationWorker.jobs.map { |job| job['duplicate-of'] } + + expect(duplicates).to all(be_nil) + end end end |