diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-06-18 09:09:05 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-06-18 09:09:05 +0000 |
commit | e2d217f69ad711a6016806fa51532cfbbaa340bd (patch) | |
tree | 4c3daeea67b4ec9a1bf19c9af1c3f3f5df589e83 | |
parent | 3743929ad41d344773ad592d28bab40d5c7a6beb (diff) | |
parent | b0e7efb5c2dd47dcd6998def5eaa8bbc46a5bb89 (diff) | |
download | gitlab-ce-e2d217f69ad711a6016806fa51532cfbbaa340bd.tar.gz |
Merge branch '62760-unquarantine-spec' into 'master'
Fix flaky time related failure in spec/models/ci/pipeline_schedule_spec.rb
Closes #62760
See merge request gitlab-org/gitlab-ce!29778
-rw-r--r-- | spec/models/ci/pipeline_schedule_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/models/ci/pipeline_schedule_spec.rb b/spec/models/ci/pipeline_schedule_spec.rb index 227870eb27f..c4d8ad5317a 100644 --- a/spec/models/ci/pipeline_schedule_spec.rb +++ b/spec/models/ci/pipeline_schedule_spec.rb @@ -128,8 +128,10 @@ describe Ci::PipelineSchedule do context 'when pipeline schedule runs every minute' do let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) } - it "updates next_run_at to the sidekiq worker's execution time", :quarantine do - expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at) + it "updates next_run_at to the sidekiq worker's execution time" do + Timecop.freeze do + expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at) + end end end |