diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /spec/workers/container_expiration_policy_worker_spec.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'spec/workers/container_expiration_policy_worker_spec.rb')
-rw-r--r-- | spec/workers/container_expiration_policy_worker_spec.rb | 123 |
1 files changed, 79 insertions, 44 deletions
diff --git a/spec/workers/container_expiration_policy_worker_spec.rb b/spec/workers/container_expiration_policy_worker_spec.rb index d9a4f6396f8..2d5176e874d 100644 --- a/spec/workers/container_expiration_policy_worker_spec.rb +++ b/spec/workers/container_expiration_policy_worker_spec.rb @@ -11,7 +11,7 @@ RSpec.describe ContainerExpirationPolicyWorker do describe '#perform' do subject { worker.perform } - RSpec.shared_examples 'not executing any policy' do + shared_examples 'not executing any policy' do it 'does not run any policy' do expect(ContainerExpirationPolicyService).not_to receive(:new) @@ -19,6 +19,21 @@ RSpec.describe ContainerExpirationPolicyWorker do end end + shared_examples 'handling a taken exclusive lease' do + context 'with exclusive lease taken' do + before do + stub_exclusive_lease_taken(worker.lease_key, timeout: 5.hours) + end + + it 'does not do anything' do + expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).not_to receive(:perform_with_capacity) + expect(worker).not_to receive(:runnable_policies) + + expect { subject }.not_to change { ContainerRepository.cleanup_scheduled.count } + end + end + end + context 'With no container expiration policies' do it 'does not execute any policies' do expect(ContainerRepository).not_to receive(:for_project_id) @@ -27,66 +42,86 @@ RSpec.describe ContainerExpirationPolicyWorker do end end - context 'with container expiration policies' do - let_it_be(:container_expiration_policy) { create(:container_expiration_policy, :runnable) } - let_it_be(:container_repository) { create(:container_repository, project: container_expiration_policy.project) } + context 'with throttling enabled' do + before do + stub_feature_flags(container_registry_expiration_policies_throttling: true) + end - context 'with a valid container expiration policy' do - it 'schedules the next run' do - expect { subject }.to change { container_expiration_policy.reload.next_run_at } + context 'with loopless disabled' do + before do + stub_feature_flags(container_registry_expiration_policies_loopless: false) end - it 'marks the container repository as scheduled for cleanup' do - expect { subject }.to change { container_repository.reload.cleanup_scheduled? }.from(false).to(true) - expect(ContainerRepository.cleanup_scheduled.count).to eq(1) - end + context 'with container expiration policies' do + let_it_be(:container_expiration_policy) { create(:container_expiration_policy, :runnable) } + let_it_be(:container_repository) { create(:container_repository, project: container_expiration_policy.project) } - it 'calls the limited capacity worker' do - expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).to receive(:perform_with_capacity) + before do + expect(worker).to receive(:with_runnable_policy).and_call_original + end - subject - end - end + context 'with a valid container expiration policy' do + it 'schedules the next run' do + expect { subject }.to change { container_expiration_policy.reload.next_run_at } + end - context 'with a disabled container expiration policy' do - before do - container_expiration_policy.disable! - end + it 'marks the container repository as scheduled for cleanup' do + expect { subject }.to change { container_repository.reload.cleanup_scheduled? }.from(false).to(true) + expect(ContainerRepository.cleanup_scheduled.count).to eq(1) + end - it 'does not run the policy' do - expect(ContainerRepository).not_to receive(:for_project_id) + it 'calls the limited capacity worker' do + expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).to receive(:perform_with_capacity) - expect { subject }.not_to change { ContainerRepository.cleanup_scheduled.count } - end - end + subject + end + end - context 'with an invalid container expiration policy' do - let(:user) { container_expiration_policy.project.owner } + context 'with a disabled container expiration policy' do + before do + container_expiration_policy.disable! + end - before do - container_expiration_policy.update_column(:name_regex, '*production') - end + it 'does not run the policy' do + expect(ContainerRepository).not_to receive(:for_project_id) - it 'disables the policy and tracks an error' do - expect(ContainerRepository).not_to receive(:for_project_id) - expect(Gitlab::ErrorTracking).to receive(:log_exception).with(instance_of(described_class::InvalidPolicyError), container_expiration_policy_id: container_expiration_policy.id) + expect { subject }.not_to change { ContainerRepository.cleanup_scheduled.count } + end + end - expect { subject }.to change { container_expiration_policy.reload.enabled }.from(true).to(false) - expect(ContainerRepository.cleanup_scheduled).to be_empty + context 'with an invalid container expiration policy' do + let(:user) { container_expiration_policy.project.owner } + + before do + container_expiration_policy.update_column(:name_regex, '*production') + end + + it 'disables the policy and tracks an error' do + expect(ContainerRepository).not_to receive(:for_project_id) + expect(Gitlab::ErrorTracking).to receive(:log_exception).with(instance_of(described_class::InvalidPolicyError), container_expiration_policy_id: container_expiration_policy.id) + + expect { subject }.to change { container_expiration_policy.reload.enabled }.from(true).to(false) + expect(ContainerRepository.cleanup_scheduled).to be_empty + end + end end - end - end - context 'with exclusive lease taken' do - before do - stub_exclusive_lease_taken(worker.lease_key, timeout: 5.hours) + it_behaves_like 'handling a taken exclusive lease' end - it 'does not execute any policy' do - expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).not_to receive(:perform_with_capacity) - expect(worker).not_to receive(:runnable_policies) + context 'with loopless enabled' do + before do + stub_feature_flags(container_registry_expiration_policies_loopless: true) + expect(worker).not_to receive(:with_runnable_policy) + end - expect { subject }.not_to change { ContainerRepository.cleanup_scheduled.count } + it 'calls the limited capacity worker' do + expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).to receive(:perform_with_capacity) + + subject + end + + it_behaves_like 'handling a taken exclusive lease' end end |