diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
commit | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (patch) | |
tree | 7c5ec884c25e03e4fea131a4d112a9d0ccfd59b8 /spec/lib/gitlab/background_migration_spec.rb | |
parent | b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/background_migration_spec.rb')
-rw-r--r-- | spec/lib/gitlab/background_migration_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/gitlab/background_migration_spec.rb b/spec/lib/gitlab/background_migration_spec.rb index 66a0b11606f..9546550bfc5 100644 --- a/spec/lib/gitlab/background_migration_spec.rb +++ b/spec/lib/gitlab/background_migration_spec.rb @@ -76,7 +76,7 @@ describe Gitlab::BackgroundMigration do end end - context 'when there are scheduled jobs present', :sidekiq, :redis do + context 'when there are scheduled jobs present', :redis do it 'steals all jobs from the scheduled sets' do Sidekiq::Testing.disable! do BackgroundMigrationWorker.perform_in(10.minutes, 'Object') @@ -91,7 +91,7 @@ describe Gitlab::BackgroundMigration do end end - context 'when there are enqueued and scheduled jobs present', :sidekiq, :redis do + context 'when there are enqueued and scheduled jobs present', :redis do it 'steals from the scheduled sets queue first' do Sidekiq::Testing.disable! do expect(described_class).to receive(:perform) @@ -107,7 +107,7 @@ describe Gitlab::BackgroundMigration do end end - context 'when retry_dead_jobs is true', :sidekiq, :redis do + context 'when retry_dead_jobs is true', :redis do let(:retry_queue) do [double(args: ['Object', [3]], queue: described_class.queue, delete: true)] end @@ -186,7 +186,7 @@ describe Gitlab::BackgroundMigration do end end - context 'when there are scheduled jobs present', :sidekiq, :redis do + context 'when there are scheduled jobs present', :redis do before do Sidekiq::Testing.disable! do BackgroundMigrationWorker.perform_in(10.minutes, 'Foo') |