diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-30 21:08:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-30 21:08:57 +0300 |
commit | 76abc55eb4656385925e156210fb8c5750c75652 (patch) | |
tree | 45ae5f75f7f9bf01eb95716566397c1ccb14527a /spec/workers/container_registry | |
parent | 02c48d0a6bf00afd66a603253ec59db4e1412392 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/container_registry')
-rw-r--r-- | spec/workers/container_registry/migration/guard_worker_spec.rb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/spec/workers/container_registry/migration/guard_worker_spec.rb b/spec/workers/container_registry/migration/guard_worker_spec.rb index 30f5957c7c7..d2bcfef2f5b 100644 --- a/spec/workers/container_registry/migration/guard_worker_spec.rb +++ b/spec/workers/container_registry/migration/guard_worker_spec.rb @@ -45,19 +45,6 @@ RSpec.describe ContainerRegistry::Migration::GuardWorker, :aggregate_failures do .and change { stale_migration.reload.migration_state }.to('import_aborted') .and not_change { ongoing_migration.migration_state } end - - context 'registry_migration_guard_thresholds feature flag disabled' do - before do - stub_feature_flags(registry_migration_guard_thresholds: false) - end - - it 'falls back on the hardcoded value' do - expect(ContainerRegistry::Migration).not_to receive(:pre_import_timeout) - - expect { subject } - .to change { stale_migration.reload.migration_state }.to('import_aborted') - end - end end context 'migration is canceled' do @@ -85,19 +72,6 @@ RSpec.describe ContainerRegistry::Migration::GuardWorker, :aggregate_failures do expect(stale_migration.reload.migration_state).to eq('import_skipped') expect(stale_migration.reload.migration_skipped_reason).to eq('migration_canceled') end - - context 'registry_migration_guard_thresholds feature flag disabled' do - before do - stub_feature_flags(registry_migration_guard_thresholds: false) - end - - it 'falls back on the hardcoded value' do - expect(ContainerRegistry::Migration).not_to receive(timeout) - - expect { subject } - .to change { stale_migration.reload.migration_state }.to('import_skipped') - end - end end context 'when the retry limit has not been reached' do |