Commit e2d217f6 authored by Lin Jen-Shin's avatar Lin Jen-Shin

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
parents 3743929a b0e7efb5
...@@ -128,10 +128,12 @@ describe Ci::PipelineSchedule do ...@@ -128,10 +128,12 @@ describe Ci::PipelineSchedule do
context 'when pipeline schedule runs every minute' do context 'when pipeline schedule runs every minute' do
let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) } let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) }
it "updates next_run_at to the sidekiq worker's execution time", :quarantine do 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) expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at)
end end
end end
end
context 'when there are two different pipeline schedules in different time zones' do context 'when there are two different pipeline schedules in different time zones' do
let(:pipeline_schedule_1) { create(:ci_pipeline_schedule, :weekly, cron_timezone: 'Eastern Time (US & Canada)') } let(:pipeline_schedule_1) { create(:ci_pipeline_schedule, :weekly, cron_timezone: 'Eastern Time (US & Canada)') }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment