diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-16 18:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-16 18:08:39 +0300 |
commit | d7b1354b396d2e579fd6fe3c18a28b6ffe934f09 (patch) | |
tree | 958e3dd6579165d790febba196d64d6ef8c86ea5 /spec/workers/container_registry | |
parent | 1c9afffa29584c92bf1bb73c005f69c6875808e6 (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 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/spec/workers/container_registry/migration/guard_worker_spec.rb b/spec/workers/container_registry/migration/guard_worker_spec.rb index 0fbc648e77f..c52a3fc5d54 100644 --- a/spec/workers/container_registry/migration/guard_worker_spec.rb +++ b/spec/workers/container_registry/migration/guard_worker_spec.rb @@ -141,7 +141,7 @@ RSpec.describe ContainerRegistry::Migration::GuardWorker, :aggregate_failures do allow(client).to receive(:import_status).and_return(import_status) end - stub_application_setting(container_registry_pre_import_timeout: 10.minutes) + stub_application_setting(container_registry_pre_import_timeout: 10.minutes.to_i) end it 'will abort the migration' do @@ -198,7 +198,7 @@ RSpec.describe ContainerRegistry::Migration::GuardWorker, :aggregate_failures do allow(client).to receive(:import_status).and_return(import_status) end - stub_application_setting(container_registry_import_timeout: 10.minutes) + stub_application_setting(container_registry_import_timeout: 10.minutes.to_i) end it 'will abort the migration' do @@ -236,4 +236,11 @@ RSpec.describe ContainerRegistry::Migration::GuardWorker, :aggregate_failures do end end end + + describe 'worker attributes' do + it 'has deduplication set' do + expect(described_class.get_deduplicate_strategy).to eq(:until_executed) + expect(described_class.get_deduplication_options).to include(ttl: 5.minutes) + end + end end |