summaryrefslogtreecommitdiff
path: root/spec/migrations
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2019-06-10 13:25:51 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-06-10 13:35:11 -0300
commit304b43a6227733d9326bca3a379c9588cbe93a8d (patch)
tree904b17b33f86670a185ffd4785d36049bf897958 /spec/migrations
parent65be6f1abf18c0ef5cc91d4af0b1212fa3b9fc52 (diff)
downloadgitlab-ce-304b43a6227733d9326bca3a379c9588cbe93a8d.tar.gz
Avoid DB timeouts when scheduling migrations
Diffstat (limited to 'spec/migrations')
-rw-r--r--spec/migrations/enqueue_reset_merge_status_spec.rb7
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