Commit f9b821f0 authored by Shinya Maeda's avatar Shinya Maeda

Fix specs for exclusive lease

parent 5a1ee0c3
...@@ -47,6 +47,6 @@ module ExclusiveLeaseGuard ...@@ -47,6 +47,6 @@ module ExclusiveLeaseGuard
end end
def log_error(message, extra_args = {}) def log_error(message, extra_args = {})
logger.error(message) Rails.logger.error(message)
end end
end end
...@@ -234,9 +234,15 @@ shared_examples_for 'common trace features' do ...@@ -234,9 +234,15 @@ shared_examples_for 'common trace features' do
context 'when build status is success' do context 'when build status is success' do
let!(:build) { create(:ci_build, :success, :trace_live) } let!(:build) { create(:ci_build, :success, :trace_live) }
it 'archives a trace' do it 'does not have an archived trace yet' do
expect(build.job_artifacts_trace).to be_nil
end
context 'when archives' do
it 'has an archived trace' do
subject subject
build.reload
expect(build.job_artifacts_trace).to be_exist expect(build.job_artifacts_trace).to be_exist
end end
...@@ -245,13 +251,16 @@ shared_examples_for 'common trace features' do ...@@ -245,13 +251,16 @@ shared_examples_for 'common trace features' do
Gitlab::ExclusiveLease.new("trace:archive:#{trace.job.id}", timeout: 1.hour).try_obtain Gitlab::ExclusiveLease.new("trace:archive:#{trace.job.id}", timeout: 1.hour).try_obtain
end end
it 'prevents multiple archiving' do it 'prevents to archive concurently' do
subject
build.reload build.reload
expect(build.job_artifacts_trace).to be_nil expect(build.job_artifacts_trace).to be_nil
end end
end end
end end
end end
end
end end
shared_examples_for 'trace with disabled live trace feature' do shared_examples_for 'trace with disabled live trace feature' do
......
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