diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-12 09:40:38 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-12 09:40:38 +0000 |
commit | 6fff0473e0cf13607fdd49f856821680298113d8 (patch) | |
tree | 43fe3ddbbe641a399edcc1928d71b82d0aeb2360 /spec | |
parent | 8a29e0b07367e1d0cc071f0de189aafcae207bf8 (diff) | |
parent | 3494cdfecb7748cca558e46c805b636b3383c299 (diff) | |
download | gitlab-ce-6fff0473e0cf13607fdd49f856821680298113d8.tar.gz |
Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build' into 'master'
Job dropping by MissingDependenciesError should consider StaleObjectError
Closes #41023
See merge request gitlab-org/gitlab-ce!15873
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/ci/register_job_service_spec.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb index 3ee59014b5b..22fb7ed7215 100644 --- a/spec/services/ci/register_job_service_spec.rb +++ b/spec/services/ci/register_job_service_spec.rb @@ -307,6 +307,19 @@ module Ci it_behaves_like 'not pick' end + + context 'when job object is staled' do + let!(:pre_stage_job) { create(:ci_build, :running, pipeline: pipeline, name: 'test', stage_idx: 0) } + + before do + allow_any_instance_of(Ci::Build).to receive(:drop!) + .and_raise(ActiveRecord::StaleObjectError.new(pending_job, :drop!)) + end + + it 'does not drop nor pick' do + expect(subject).to be_nil + end + end end shared_examples 'validation is not active' do |