diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-08 16:06:49 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-10 14:48:40 +0300 |
| commit | c76e5ef887c15190866c5984a37bdeaa961c3cc0 (patch) | |
| tree | 3c36596249821099460c68d267ff75fb965ea354 /spec/migrations | |
| parent | 2e0f4f658133e975b792584153fd468c76c5e1ef (diff) | |
Merge branch 'delay-background-migrations' into 'master'
Run background migrations with a minimum interval
Closes #41624
See merge request gitlab-org/gitlab-ce!16230
(cherry picked from commit 8ff0c9b15124a391bc2fc9059211d2b8d5373a2d)
7f30bb9c Run background migrations with a minimum interval
Diffstat (limited to 'spec/migrations')
| -rw-r--r-- | spec/migrations/normalize_ldap_extern_uids_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/migrations/normalize_ldap_extern_uids_spec.rb b/spec/migrations/normalize_ldap_extern_uids_spec.rb index 262d7742aaf..56a78f52802 100644 --- a/spec/migrations/normalize_ldap_extern_uids_spec.rb +++ b/spec/migrations/normalize_ldap_extern_uids_spec.rb @@ -27,11 +27,11 @@ describe NormalizeLdapExternUids, :migration, :sidekiq do migrate! expect(BackgroundMigrationWorker.jobs[0]['args']).to eq([described_class::MIGRATION, [1, 2]]) - expect(BackgroundMigrationWorker.jobs[0]['at']).to eq(10.seconds.from_now.to_f) + expect(BackgroundMigrationWorker.jobs[0]['at']).to eq(5.minutes.from_now.to_f) expect(BackgroundMigrationWorker.jobs[1]['args']).to eq([described_class::MIGRATION, [3, 4]]) - expect(BackgroundMigrationWorker.jobs[1]['at']).to eq(20.seconds.from_now.to_f) + expect(BackgroundMigrationWorker.jobs[1]['at']).to eq(10.minutes.from_now.to_f) expect(BackgroundMigrationWorker.jobs[2]['args']).to eq([described_class::MIGRATION, [5, 5]]) - expect(BackgroundMigrationWorker.jobs[2]['at']).to eq(30.seconds.from_now.to_f) + expect(BackgroundMigrationWorker.jobs[2]['at']).to eq(15.minutes.from_now.to_f) expect(BackgroundMigrationWorker.jobs.size).to eq 3 end end |