diff options
Diffstat (limited to 'spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb')
-rw-r--r-- | spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb b/spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb index e71f1a4266a..e95a449d615 100644 --- a/spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb +++ b/spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb @@ -20,7 +20,7 @@ RSpec.describe Ci::JobArtifacts::DestroyAllExpiredService, :clean_gitlab_redis_s context 'with preloaded relationships' do before do - stub_const("#{described_class}::LOOP_LIMIT", 1) + stub_const("#{described_class}::LARGE_LOOP_LIMIT", 1) end context 'with ci_destroy_unlocked_job_artifacts feature flag disabled' do @@ -53,46 +53,6 @@ RSpec.describe Ci::JobArtifacts::DestroyAllExpiredService, :clean_gitlab_redis_s log = ActiveRecord::QueryRecorder.new { subject } expect(log.count).to be_within(1).of(8) end - - context 'with several locked-unknown artifact records' do - before do - stub_const("#{described_class}::LOOP_LIMIT", 10) - stub_const("#{described_class}::BATCH_SIZE", 2) - end - - let!(:lockable_artifact_records) do - [ - create(:ci_job_artifact, :metadata, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: locked_job), - create(:ci_job_artifact, :junit, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: locked_job), - create(:ci_job_artifact, :sast, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: locked_job), - create(:ci_job_artifact, :cobertura, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: locked_job), - create(:ci_job_artifact, :trace, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: locked_job) - ] - end - - let!(:unlockable_artifact_records) do - [ - create(:ci_job_artifact, :metadata, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: job), - create(:ci_job_artifact, :junit, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: job), - create(:ci_job_artifact, :sast, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: job), - create(:ci_job_artifact, :cobertura, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: job), - create(:ci_job_artifact, :trace, :expired, locked: ::Ci::JobArtifact.lockeds[:unknown], job: job), - artifact - ] - end - - it 'updates the locked status of job artifacts from artifacts-locked pipelines' do - subject - - expect(lockable_artifact_records).to be_all(&:persisted?) - expect(lockable_artifact_records).to be_all { |artifact| artifact.reload.artifact_artifacts_locked? } - end - - it 'unlocks and then destroys job artifacts from artifacts-unlocked pipelines' do - expect { subject }.to change { Ci::JobArtifact.count }.by(-6) - expect(Ci::JobArtifact.where(id: unlockable_artifact_records.map(&:id))).to be_empty - end - end end end @@ -159,7 +119,7 @@ RSpec.describe Ci::JobArtifacts::DestroyAllExpiredService, :clean_gitlab_redis_s let!(:artifact) { create(:ci_job_artifact, :expired, job: job, locked: job.pipeline.locked) } before do - stub_const("#{described_class}::LOOP_LIMIT", 10) + stub_const("#{described_class}::LARGE_LOOP_LIMIT", 10) end context 'when the import fails' do @@ -229,7 +189,8 @@ RSpec.describe Ci::JobArtifacts::DestroyAllExpiredService, :clean_gitlab_redis_s context 'when loop reached loop limit' do before do - stub_const("#{described_class}::LOOP_LIMIT", 1) + stub_feature_flags(ci_artifact_fast_removal_large_loop_limit: false) + stub_const("#{described_class}::SMALL_LOOP_LIMIT", 1) end it 'destroys one artifact' do |