diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-10 20:36:19 +0300 |
|---|---|---|
| committer | 🤖 GitLab Bot 🤖 <gitlab-bot@gitlab.com> | 2019-06-11 02:20:56 +0300 |
| commit | 3aaaaff49a1e0a7d7459b37df106747704549840 (patch) | |
| tree | 2c5841f7086feeff4b7b38a20bac55973fb83448 /spec | |
| parent | 8ad82e5ee072428d0acbce6938e02c3166e49d5f (diff) | |
Merge branch 'osw-fix-post-dep-migration-with-timeout' into 'master'
Avoid DB timeouts when scheduling migrations
Closes #63036
See merge request gitlab-org/gitlab-ce!29437
(cherry picked from commit 9254b5d4c0cc41e552e896e16ef0bf62b5d9ae5b)
304b43a6 Avoid DB timeouts when scheduling migrations
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/migrations/enqueue_reset_merge_status_spec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/migrations/enqueue_reset_merge_status_spec.rb b/spec/migrations/enqueue_reset_merge_status_spec.rb index 0d5e33bfd46..a6dd2e08079 100644 --- a/spec/migrations/enqueue_reset_merge_status_spec.rb +++ b/spec/migrations/enqueue_reset_merge_status_spec.rb @@ -40,9 +40,12 @@ describe EnqueueResetMergeStatus, :migration, :sidekiq do .to be_scheduled_delayed_migration(5.minutes, 1, 2) expect(described_class::MIGRATION) - .to be_scheduled_delayed_migration(10.minutes, 3, 3) + .to be_scheduled_delayed_migration(10.minutes, 3, 4) - expect(BackgroundMigrationWorker.jobs.size).to eq(2) + expect(described_class::MIGRATION) + .to be_scheduled_delayed_migration(15.minutes, 5, 5) + + expect(BackgroundMigrationWorker.jobs.size).to eq(3) end end end |