diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 21:09:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 21:09:06 +0000 |
commit | 376ae6f3b376d6956fe037c9097b48a2e4867859 (patch) | |
tree | 80fa30139aa81d962efed6ebba47d81170419bb1 /spec/services/ci | |
parent | b9d98fe10a624d9a6033c516c970954b4fc09372 (diff) | |
download | gitlab-ce-376ae6f3b376d6956fe037c9097b48a2e4867859.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/ci')
-rw-r--r-- | spec/services/ci/pipeline_processing/shared_processing_service.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/services/ci/pipeline_processing/shared_processing_service.rb b/spec/services/ci/pipeline_processing/shared_processing_service.rb index 7de22b6a4cc..bbd7422b435 100644 --- a/spec/services/ci/pipeline_processing/shared_processing_service.rb +++ b/spec/services/ci/pipeline_processing/shared_processing_service.rb @@ -259,14 +259,14 @@ RSpec.shared_examples 'Pipeline Processing Service' do expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'scheduled' }) - Timecop.travel 2.minutes.from_now do + travel_to 2.minutes.from_now do enqueue_scheduled('rollout10%') end succeed_pending expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'success', 'rollout100%': 'scheduled' }) - Timecop.travel 2.minutes.from_now do + travel_to 2.minutes.from_now do enqueue_scheduled('rollout100%') end succeed_pending @@ -330,7 +330,7 @@ RSpec.shared_examples 'Pipeline Processing Service' do expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'scheduled' }) - Timecop.travel 2.minutes.from_now do + travel_to 2.minutes.from_now do enqueue_scheduled('rollout10%') end fail_running_or_pending @@ -398,7 +398,7 @@ RSpec.shared_examples 'Pipeline Processing Service' do expect(process_pipeline).to be_truthy expect(builds_names_and_statuses).to eq({ 'delayed1': 'scheduled', 'delayed2': 'scheduled' }) - Timecop.travel 2.minutes.from_now do + travel_to 2.minutes.from_now do enqueue_scheduled('delayed1') end @@ -419,7 +419,7 @@ RSpec.shared_examples 'Pipeline Processing Service' do expect(process_pipeline).to be_truthy expect(builds_names_and_statuses).to eq({ 'delayed': 'scheduled' }) - Timecop.travel 2.minutes.from_now do + travel_to 2.minutes.from_now do enqueue_scheduled('delayed') end fail_running_or_pending |