diff options
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/click_house/event_paths_consistency_cron_worker_spec.rb | 8 | ||||
| -rw-r--r-- | spec/workers/projects/git_garbage_collect_worker_spec.rb | 18 |
2 files changed, 5 insertions, 21 deletions
diff --git a/spec/workers/click_house/event_paths_consistency_cron_worker_spec.rb b/spec/workers/click_house/event_paths_consistency_cron_worker_spec.rb index 76ce63ed2e4..e9efad169ff 100644 --- a/spec/workers/click_house/event_paths_consistency_cron_worker_spec.rb +++ b/spec/workers/click_house/event_paths_consistency_cron_worker_spec.rb @@ -96,18 +96,20 @@ RSpec.describe ClickHouse::EventPathsConsistencyCronWorker, feature_category: :v stub_const("#{ClickHouse::Concerns::ConsistencyWorker}::POSTGRESQL_BATCH_SIZE", 1) expect(worker).to receive(:log_extra_metadata_on_done).with(:result, - { status: :modification_limit_reached, modifications: 2 }) + { status: :limit_reached, modifications: 1 }) worker.perform paths = [ "#{namespace1.id}/", "#{namespace2.traversal_ids.join('/')}/", - "#{namespace_with_updated_parent.traversal_ids.join('/')}/" + "#{namespace_with_updated_parent.traversal_ids.join('/')}/", + "#{deleted_namespace_id}/" ] expect(leftover_paths).to match_array(paths) - expect(ClickHouse::SyncCursor.cursor_for(:event_namespace_paths_consistency_check)).to eq(deleted_namespace_id) + expect(ClickHouse::SyncCursor.cursor_for(:event_namespace_paths_consistency_check)) + .to eq(namespace_with_updated_parent.id) end end diff --git a/spec/workers/projects/git_garbage_collect_worker_spec.rb b/spec/workers/projects/git_garbage_collect_worker_spec.rb index 7daee107a74..259943af2b5 100644 --- a/spec/workers/projects/git_garbage_collect_worker_spec.rb +++ b/spec/workers/projects/git_garbage_collect_worker_spec.rb @@ -81,24 +81,6 @@ RSpec.describe Projects::GitGarbageCollectWorker, feature_category: :source_code expect(project.lfs_objects.reload).to include(lfs_object) end - - context 'when feature flag "reorder_garbage_collection_calls" is disabled' do - before do - stub_feature_flags(reorder_garbage_collection_calls: false) - end - - it 'cleans up unreferenced LFS object first' do - expect_next_instance_of(Gitlab::Cleanup::OrphanLfsFileReferences) do |svc| - expect(svc.project).to eq(project) - expect(svc.dry_run).to be_falsy - expect(svc).to receive(:run!).and_call_original - end - - expect { subject.perform(*params) }.to raise_error('Boom') - - expect(project.lfs_objects.reload).not_to include(lfs_object) - end - end end it 'catches and logs exceptions' do |