Commit 1670a9fe authored by Shinya Maeda's avatar Shinya Maeda

Fixed static analysys

parent 414a638b
...@@ -4,7 +4,7 @@ module Ci ...@@ -4,7 +4,7 @@ module Ci
return if job.job_artifacts_trace return if job.job_artifacts_trace
job.trace.read do |stream| job.trace.read do |stream|
return unless stream.file? return unless stream.file? # rubocop:disable Lint/NonLocalExitFromIterator
temp_file!(stream.path, JobArtifactUploader.workhorse_upload_path) do |temp_path| temp_file!(stream.path, JobArtifactUploader.workhorse_upload_path) do |temp_path|
job.create_job_artifacts_trace!( job.create_job_artifacts_trace!(
......
...@@ -12,13 +12,13 @@ describe Ci::CreateTraceArtifactService do ...@@ -12,13 +12,13 @@ describe Ci::CreateTraceArtifactService do
let(:new_path) { job.job_artifacts_trace.file.path } let(:new_path) { job.job_artifacts_trace.file.path }
let(:new_checksum) { Digest::SHA256.file(new_path).hexdigest } let(:new_checksum) { Digest::SHA256.file(new_path).hexdigest }
it { expect(File.exists?(legacy_path)).to be_truthy } it { expect(File.exist?(legacy_path)).to be_truthy }
it 'creates trace artifact' do it 'creates trace artifact' do
expect { subject }.to change { Ci::JobArtifact.count }.by(1) expect { subject }.to change { Ci::JobArtifact.count }.by(1)
expect(File.exists?(legacy_path)).to be_falsy expect(File.exist?(legacy_path)).to be_falsy
expect(File.exists?(new_path)).to be_truthy expect(File.exist?(new_path)).to be_truthy
expect(new_checksum).to eq(legacy_checksum) expect(new_checksum).to eq(legacy_checksum)
expect(job.job_artifacts_trace.file.exists?).to be_truthy expect(job.job_artifacts_trace.file.exists?).to be_truthy
expect(job.job_artifacts_trace.file.filename).to eq('job.log') expect(job.job_artifacts_trace.file.filename).to eq('job.log')
...@@ -37,7 +37,7 @@ describe Ci::CreateTraceArtifactService do ...@@ -37,7 +37,7 @@ describe Ci::CreateTraceArtifactService do
end end
it 'keeps legacy trace and removes trace artifact' do it 'keeps legacy trace and removes trace artifact' do
expect(File.exists?(legacy_path)).to be_truthy expect(File.exist?(legacy_path)).to be_truthy
expect(job.job_artifacts_trace).to be_nil expect(job.job_artifacts_trace).to be_nil
end end
end end
...@@ -50,7 +50,7 @@ describe Ci::CreateTraceArtifactService do ...@@ -50,7 +50,7 @@ describe Ci::CreateTraceArtifactService do
it 'raises an error' do it 'raises an error' do
expect { subject }.to raise_error('Trace artifact not found') expect { subject }.to raise_error('Trace artifact not found')
expect(File.exists?(legacy_path)).to be_truthy expect(File.exist?(legacy_path)).to be_truthy
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment