diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-06 19:16:09 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-06 19:16:09 +0300 |
| commit | 964d9f431f64754f171c5c523309417447c2ee71 (patch) | |
| tree | d9d06c1ba2397ce9717a8ce0b01deb96d2bcce6b /spec/migrations | |
| parent | b4415c01740430cef58baf9bb0cbda2fb1055edb (diff) | |
| parent | 1e5192cc8c2ebd3e0d740f3a044b7f5e4c086730 (diff) | |
Merge branch 'background-migrations-system-load' into 'master'
Respond to DB health in background migrations
See merge request gitlab-org/gitlab-ce!20720
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 c6ea1e3e49e..a23a5d54e0a 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(5.minutes.from_now.to_f) + expect(BackgroundMigrationWorker.jobs[0]['at']).to eq(2.minutes.from_now.to_f) expect(BackgroundMigrationWorker.jobs[1]['args']).to eq([described_class::MIGRATION, [3, 4]]) - expect(BackgroundMigrationWorker.jobs[1]['at']).to eq(10.minutes.from_now.to_f) + expect(BackgroundMigrationWorker.jobs[1]['at']).to eq(4.minutes.from_now.to_f) expect(BackgroundMigrationWorker.jobs[2]['args']).to eq([described_class::MIGRATION, [5, 5]]) - expect(BackgroundMigrationWorker.jobs[2]['at']).to eq(15.minutes.from_now.to_f) + expect(BackgroundMigrationWorker.jobs[2]['at']).to eq(6.minutes.from_now.to_f) expect(BackgroundMigrationWorker.jobs.size).to eq 3 end end |