Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-05-02 13:28:39 +0300
committerDouwe Maan <douwe@gitlab.com>2019-05-02 13:28:39 +0300
commit86900f00004ed5f862c3b72b4f643036f97a8e56 (patch)
treebee69e311b41536d323f617984b340df28f3febc /spec/models
parent743508bfa5f19b201790f14648667eb38e255282 (diff)
parentd6cf6fd754842d67fe4bcc39e35a9a298ac60091 (diff)
Merge branch '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master'
Disable retrying cancelled jobs Closes #53064 See merge request gitlab-org/gitlab-ce!27503
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/ci/build_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 59ec7310391..8c73f37bd32 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1434,7 +1434,7 @@ describe Ci::Build do
build.cancel!
end
- it { is_expected.to be_retryable }
+ it { is_expected.not_to be_retryable }
end
end
@@ -1964,7 +1964,7 @@ describe Ci::Build do
context 'when build has been canceled' do
subject { build_stubbed(:ci_build, :manual, status: :canceled) }
- it { is_expected.to be_playable }
+ it { is_expected.not_to be_playable }
end
context 'when build is successful' do