diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:07:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:07:52 +0000 |
| commit | c6c7437861bff9572747674095c4dfbdfbea4988 (patch) | |
| tree | 237d1ed922193f19ae326923457344c082003788 /spec/lib/gitlab/sidekiq_queue_spec.rb | |
| parent | d80f3cd75e700b6e62910865bfd36734644ffa89 (diff) | |
| download | gitlab-ce-c6c7437861bff9572747674095c4dfbdfbea4988.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/sidekiq_queue_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/sidekiq_queue_spec.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/spec/lib/gitlab/sidekiq_queue_spec.rb b/spec/lib/gitlab/sidekiq_queue_spec.rb index 7a4d47563b6..9516ea10511 100644 --- a/spec/lib/gitlab/sidekiq_queue_spec.rb +++ b/spec/lib/gitlab/sidekiq_queue_spec.rb @@ -31,14 +31,7 @@ describe Gitlab::SidekiqQueue do context 'when the queue is not processed in time' do before do - calls = 0 - - allow(sidekiq_queue).to receive(:job_matches?).and_wrap_original do |m, *args| - raise Timeout::Error if calls > 0 - - calls += 1 - m.call(*args) - end + allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(1, 2, 12) end it 'returns a non-completion flag, the number of jobs deleted, and the remaining queue size' do |