summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-03-19 22:48:09 +0900
committerShinya Maeda <shinya@gitlab.com>2018-03-19 22:48:09 +0900
commit301c4ef9502e02799e64937b35fb47b2e15827b3 (patch)
treeff32e90edf47e652e4ad489ea1482dbd26b24cc7
parent6cfea81e6dc51e9627e2b2f64e29834e0e9bfc60 (diff)
downloadgitlab-ce-301c4ef9502e02799e64937b35fb47b2e15827b3.tar.gz
Use update_column than write_attribute and savefix/sm/erase_old_trace
-rw-r--r--app/models/ci/build.rb3
-rw-r--r--spec/lib/gitlab/ci/trace_spec.rb22
2 files changed, 23 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index c1da2081465..e68c1012199 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -328,8 +328,7 @@ module Ci
end
def erase_old_trace!
- write_attribute(:trace, nil)
- save
+ update_column(:trace, nil)
end
def needs_touch?
diff --git a/spec/lib/gitlab/ci/trace_spec.rb b/spec/lib/gitlab/ci/trace_spec.rb
index 448c6fb57dd..3a9371ed2e8 100644
--- a/spec/lib/gitlab/ci/trace_spec.rb
+++ b/spec/lib/gitlab/ci/trace_spec.rb
@@ -510,6 +510,28 @@ describe Gitlab::Ci::Trace do
it_behaves_like 'source trace in database stays intact', error: ActiveRecord::RecordInvalid
end
+
+ context 'when there is a validation error on Ci::Build' do
+ before do
+ allow_any_instance_of(Ci::Build).to receive(:save).and_return(false)
+ allow_any_instance_of(Ci::Build).to receive_message_chain(:errors, :full_messages)
+ .and_return(%w[Error Error])
+ end
+
+ context "when erase old trace with 'save'" do
+ before do
+ build.send(:write_attribute, :trace, nil)
+ build.save
+ end
+
+ it 'old trace is not deleted' do
+ build.reload
+ expect(build.trace.raw).to eq(trace_content)
+ end
+ end
+
+ it_behaves_like 'archive trace in database'
+ end
end
end