diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/workers/git_garbage_collect_worker_spec.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/workers/git_garbage_collect_worker_spec.rb')
-rw-r--r-- | spec/workers/git_garbage_collect_worker_spec.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb index fc9115a5ea1..13089549086 100644 --- a/spec/workers/git_garbage_collect_worker_spec.rb +++ b/spec/workers/git_garbage_collect_worker_spec.rb @@ -272,6 +272,11 @@ RSpec.describe GitGarbageCollectWorker do expect(before_packs.count).to be >= 1 + expect_any_instance_of(Gitlab::GitalyClient::RepositoryService) + .to receive(:garbage_collect) + .with(bitmaps_enabled, prune: false) + .and_call_original + subject.perform(project.id, 'gc', lease_key, lease_uuid) after_packed_refs = packed_refs(project) after_packs = packs(project) @@ -292,6 +297,15 @@ RSpec.describe GitGarbageCollectWorker do subject.perform(project.id, 'gc', lease_key, lease_uuid) end + + it 'prune calls garbage_collect with the option prune: true' do + expect_any_instance_of(Gitlab::GitalyClient::RepositoryService) + .to receive(:garbage_collect) + .with(bitmaps_enabled, prune: true) + .and_return(nil) + + subject.perform(project.id, 'prune', lease_key, lease_uuid) + end end context 'with bitmaps enabled' do |