diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 12:10:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 12:10:10 +0300 |
commit | 22e9f240efba67d752e33ebdb8ba8205f187dc83 (patch) | |
tree | b8800e461d7a5c0f8d42400bfaa64a4165a6e4bd /spec/services/ci | |
parent | 82009412a065a58d076adbaa723268188fd9b20a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/ci')
-rw-r--r-- | spec/services/ci/register_job_service_spec.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb index 554fd4d4fb0..c4b1e2133ed 100644 --- a/spec/services/ci/register_job_service_spec.rb +++ b/spec/services/ci/register_job_service_spec.rb @@ -711,11 +711,7 @@ module Ci end end - context 'when ci_register_job_service_one_by_one is enabled' do - before do - stub_feature_flags(ci_register_job_service_one_by_one: true) - end - + context 'when a long queue is created' do it 'picks builds one-by-one' do expect(Ci::Build).to receive(:find).with(pending_job.id).and_call_original @@ -725,14 +721,6 @@ module Ci include_examples 'handles runner assignment' end - context 'when ci_register_job_service_one_by_one is disabled' do - before do - stub_feature_flags(ci_register_job_service_one_by_one: false) - end - - include_examples 'handles runner assignment' - end - context 'when joining with pending builds table' do before do stub_feature_flags(ci_pending_builds_queue_join: true) |