Make build retryable only if complete and executed
This commit is contained in:
parent
5f590a71fd
commit
a9ec4ec07e
|
@ -134,7 +134,8 @@ module Ci
|
|||
end
|
||||
|
||||
def retryable?
|
||||
project.builds_enabled? && commands.present? && complete?
|
||||
project.builds_enabled? && commands.present? &&
|
||||
(success? || failed?)
|
||||
end
|
||||
|
||||
def retried?
|
||||
|
|
|
@ -900,20 +900,42 @@ describe Ci::Build, models: true do
|
|||
end
|
||||
|
||||
describe '#retryable?' do
|
||||
subject { build }
|
||||
|
||||
context 'when build is retryable' do
|
||||
context 'when build is successful' do
|
||||
before do
|
||||
build.success!
|
||||
end
|
||||
|
||||
it { is_expected.to be_retryable }
|
||||
end
|
||||
|
||||
context 'when build is failed' do
|
||||
before do
|
||||
build.drop!
|
||||
end
|
||||
|
||||
it { is_expected.to be_retryable }
|
||||
end
|
||||
end
|
||||
|
||||
context 'when build is not retryable' do
|
||||
context 'when build is running' do
|
||||
before do
|
||||
build.run!
|
||||
end
|
||||
|
||||
it { expect(build).not_to be_retryable }
|
||||
it { is_expected.not_to be_retryable }
|
||||
end
|
||||
|
||||
context 'when build is finished' do
|
||||
context 'when build is skipped' do
|
||||
before do
|
||||
build.success!
|
||||
build.skip!
|
||||
end
|
||||
|
||||
it { expect(build).to be_retryable }
|
||||
it { is_expected.not_to be_retryable }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue