diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-06-06 08:32:04 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-06-06 08:32:04 +0000 |
commit | 8501edcd465923c9c6a45abe6c863fc3cd25973a (patch) | |
tree | e431db125935a9b609d0a25f707cc50e1b59e555 /spec/models | |
parent | 6e5d891e508d92f3a983f2edd4f441c8b0fdad74 (diff) | |
parent | e58e24b4d4256a42c0c7e764227f3c3c53fdb1bd (diff) | |
download | gitlab-ce-8501edcd465923c9c6a45abe6c863fc3cd25973a.tar.gz |
Merge branch 'revert-86900f00' into 'master'
Revert "Disable retrying cancelled jobs"
Closes #62350
See merge request gitlab-org/gitlab-ce!29201
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/build_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 89d18abee27..d98db024f73 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1294,7 +1294,7 @@ describe Ci::Build do build.cancel! end - it { is_expected.not_to be_retryable } + it { is_expected.to be_retryable } end end @@ -1824,7 +1824,7 @@ describe Ci::Build do context 'when build has been canceled' do subject { build_stubbed(:ci_build, :manual, status: :canceled) } - it { is_expected.not_to be_playable } + it { is_expected.to be_playable } end context 'when build is successful' do |