diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-17 11:45:52 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-17 11:45:52 +0300 |
commit | af41bd41e9c018eaac4ba9f1e6165aeea894f824 (patch) | |
tree | de9596ed82c13db1e475f48a66d9f091c34ec44d /spec/lib/gitlab/background_migration_spec.rb | |
parent | 7b146ab6c3a08f40acff5301ecaa60e8f83010a4 (diff) |
Fix off-by-one error in background migration retries
Diffstat (limited to 'spec/lib/gitlab/background_migration_spec.rb')
-rw-r--r-- | spec/lib/gitlab/background_migration_spec.rb | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/spec/lib/gitlab/background_migration_spec.rb b/spec/lib/gitlab/background_migration_spec.rb index 9c6b07f02cc..64f59c72cec 100644 --- a/spec/lib/gitlab/background_migration_spec.rb +++ b/spec/lib/gitlab/background_migration_spec.rb @@ -63,14 +63,10 @@ describe Gitlab::BackgroundMigration do end context 'when standard error is being raised' do - before do - allow(migration).to receive(:perform).with(10, 20) - .and_raise(StandardError, 'Migration error') - end - it 'recovers from an exception and retries the migration' do expect(migration).to receive(:perform).with(10, 20) - .exactly(3).times.ordered + .and_raise(StandardError, 'Migration error') + .exactly(4).times.ordered expect(migration).to receive(:perform).with(20, 30) .once.ordered expect(Rails.logger).to receive(:warn) @@ -148,7 +144,17 @@ describe Gitlab::BackgroundMigration do expect(migration).to receive(:perform).with(10, 20) .and_raise(StandardError).once - expect { described_class.perform('Foo', [10, 20], retries: 0) } + expect { described_class.perform('Foo', [10, 20], retries: 0) } + .to raise_error(StandardError) + end + end + + context 'when retries count is one' do + it 'retries a background migration when needed' do + expect(migration).to receive(:perform).with(10, 20) + .and_raise(StandardError).twice + + expect { described_class.perform('Foo', [10, 20], retries: 1) } .to raise_error(StandardError) end end @@ -156,9 +162,9 @@ describe Gitlab::BackgroundMigration do context 'when retries count is larger than zero' do it 'retries a background migration when needed' do expect(migration).to receive(:perform).with(10, 20) - .and_raise(StandardError).exactly(3).times + .and_raise(StandardError).exactly(4).times - expect { described_class.perform('Foo', [10, 20], retries: 3) } + expect { described_class.perform('Foo', [10, 20], retries: 3) } .to raise_error(StandardError) end end |