summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-03-18 14:46:51 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-03-18 14:46:51 +0100
commit5d9cf7b415f58b15a28ec4c7a3c6563a49e02981 (patch)
tree6af35001fc72e7578ad7d930c10daa0e2be4af81
parent2057bc02a31a20765e165b503b877350e892908b (diff)
downloadgitlab-ce-5d9cf7b415f58b15a28ec4c7a3c6563a49e02981.tar.gz
Fix HousekeepingService testsno-gc-retry
-rw-r--r--spec/services/projects/housekeeping_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/projects/housekeeping_service_spec.rb b/spec/services/projects/housekeeping_service_spec.rb
index 93bf1b81fbe..4c5ced7e746 100644
--- a/spec/services/projects/housekeeping_service_spec.rb
+++ b/spec/services/projects/housekeeping_service_spec.rb
@@ -12,7 +12,7 @@ describe Projects::HousekeepingService do
it 'enqueues a sidekiq job' do
expect(subject).to receive(:try_obtain_lease).and_return(true)
- expect(GitlabShellWorker).to receive(:perform_async).with(:gc, project.path_with_namespace)
+ expect(GitlabShellOneShotWorker).to receive(:perform_async).with(:gc, project.path_with_namespace)
subject.execute
expect(project.pushes_since_gc).to eq(0)
@@ -20,7 +20,7 @@ describe Projects::HousekeepingService do
it 'does not enqueue a job when no lease can be obtained' do
expect(subject).to receive(:try_obtain_lease).and_return(false)
- expect(GitlabShellWorker).not_to receive(:perform_async)
+ expect(GitlabShellOneShotWorker).not_to receive(:perform_async)
expect { subject.execute }.to raise_error(Projects::HousekeepingService::LeaseTaken)
expect(project.pushes_since_gc).to eq(0)