Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescue
This commit is contained in:
parent
f61666c0d7
commit
8e92e25b62
|
@ -3,8 +3,6 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
|
||||||
|
|
||||||
DOWNTIME = false
|
DOWNTIME = false
|
||||||
|
|
||||||
disable_ddl_transaction!
|
|
||||||
|
|
||||||
def up
|
def up
|
||||||
add_column :ci_pipelines, :iid, :integer
|
add_column :ci_pipelines, :iid, :integer
|
||||||
end
|
end
|
||||||
|
|
|
@ -23,7 +23,7 @@ module Gitlab
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique => e
|
rescue ActiveRecord::RecordInvalid => e
|
||||||
error("Failed to persist the pipeline: #{e}")
|
error("Failed to persist the pipeline: #{e}")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -37,17 +37,6 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when pipeline has validation errors' do
|
context 'when pipeline has validation errors' do
|
||||||
shared_examples_for 'expectations' do
|
|
||||||
it 'breaks the chain' do
|
|
||||||
expect(step.break?).to be true
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'appends validation error' do
|
|
||||||
expect(pipeline.errors.to_a)
|
|
||||||
.to include /Failed to persist the pipeline/
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when ref is nil' do
|
context 'when ref is nil' do
|
||||||
let(:pipeline) do
|
let(:pipeline) do
|
||||||
build(:ci_pipeline, project: project, ref: nil)
|
build(:ci_pipeline, project: project, ref: nil)
|
||||||
|
@ -57,18 +46,14 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
|
||||||
step.perform!
|
step.perform!
|
||||||
end
|
end
|
||||||
|
|
||||||
it_behaves_like 'expectations'
|
it 'breaks the chain' do
|
||||||
end
|
expect(step.break?).to be true
|
||||||
|
|
||||||
context 'when pipeline has a duplicate iid' do
|
|
||||||
before do
|
|
||||||
allow_any_instance_of(Ci::Pipeline).to receive(:ensure_project_iid!) { |p| p.send(:write_attribute, :iid, 1) }
|
|
||||||
create(:ci_pipeline, project: project)
|
|
||||||
|
|
||||||
step.perform!
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it_behaves_like 'expectations'
|
it 'appends validation error' do
|
||||||
|
expect(pipeline.errors.to_a)
|
||||||
|
.to include /Failed to persist the pipeline/
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue