diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-20 14:32:32 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-20 14:32:32 +0100 |
commit | a5ab418c370d79b3fe7e82ad00c47459ade678d8 (patch) | |
tree | 133c662c4de181bc7f2866b979107b90784a26cb | |
parent | ecb9f978eba1f1693f30e36428f3ace9b59af1e7 (diff) | |
download | gitlab-ce-a5ab418c370d79b3fe7e82ad00c47459ade678d8.tar.gz |
Add missing specs for update build queue servicefix-shared-runners-queue-update
-rw-r--r-- | app/services/ci/update_build_queue_service.rb | 4 | ||||
-rw-r--r-- | spec/services/ci/update_build_queue_service_spec.rb | 47 |
2 files changed, 50 insertions, 1 deletions
diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb index d57adf27104..152c8ae5006 100644 --- a/app/services/ci/update_build_queue_service.rb +++ b/app/services/ci/update_build_queue_service.rb @@ -7,11 +7,13 @@ module Ci end end + return unless build.project.shared_runners_enabled? + Ci::Runner.shared.each do |runner| if runner.can_pick?(build) runner.tick_runner_queue end - end if build.project.shared_runners_enabled? + end end end end diff --git a/spec/services/ci/update_build_queue_service_spec.rb b/spec/services/ci/update_build_queue_service_spec.rb new file mode 100644 index 00000000000..f01a388b895 --- /dev/null +++ b/spec/services/ci/update_build_queue_service_spec.rb @@ -0,0 +1,47 @@ +require 'spec_helper' + +describe Ci::UpdateBuildQueueService, :services do + let(:project) { create(:project) } + let(:build) { create(:ci_build, pipeline: pipeline) } + let(:pipeline) { create(:ci_pipeline, project: project) } + + context 'when updating specific runners' do + let(:runner) { create(:ci_runner) } + + context 'when there are runner that can pick build' do + before { build.project.runners << runner } + + it 'ticks runner queue value' do + expect { subject.execute(build) } + .to change { runner.ensure_runner_queue_value } + end + end + + context 'when there are no runners that can pick build' do + it 'does not tick runner queue value' do + expect { subject.execute(build) } + .not_to change { runner.ensure_runner_queue_value } + end + end + end + + context 'when updating shared runners' do + let(:runner) { create(:ci_runner, :shared) } + + context 'when there are runner that can pick build' do + it 'ticks runner queue value' do + expect { subject.execute(build) } + .to change { runner.ensure_runner_queue_value } + end + end + + context 'when there are no runners that can pick build' do + before { build.tag_list = [:docker] } + + it 'does not tick runner queue value' do + expect { subject.execute(build) } + .not_to change { runner.ensure_runner_queue_value } + end + end + end +end |