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

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