Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d382ed5e
Commit
d382ed5e
authored
Jul 20, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix CI/CD job auto-retry specs
parent
23223ba6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+2
-2
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+2
-2
No files found.
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
d382ed5e
...
@@ -35,11 +35,11 @@ module Ci
...
@@ -35,11 +35,11 @@ module Ci
describe
'retry entry'
do
describe
'retry entry'
do
context
'when retry count is specified'
do
context
'when retry count is specified'
do
let
(
:config
)
do
let
(
:config
)
do
YAML
.
dump
(
rspec:
{
script:
'rspec'
,
retry:
3
})
YAML
.
dump
(
rspec:
{
script:
'rspec'
,
retry:
1
})
end
end
it
'includes retry count in build options attribute'
do
it
'includes retry count in build options attribute'
do
expect
(
subject
[
:options
]).
to
include
(
retry:
3
)
expect
(
subject
[
:options
]).
to
include
(
retry:
1
)
end
end
end
end
...
...
spec/services/ci/create_pipeline_service_spec.rb
View file @
d382ed5e
...
@@ -323,7 +323,7 @@ describe Ci::CreatePipelineService, :services do
...
@@ -323,7 +323,7 @@ describe Ci::CreatePipelineService, :services do
context
'when builds with auto-retries are configured'
do
context
'when builds with auto-retries are configured'
do
before
do
before
do
config
=
YAML
.
dump
(
rspec:
{
script:
'rspec'
,
retry:
3
})
config
=
YAML
.
dump
(
rspec:
{
script:
'rspec'
,
retry:
2
})
stub_ci_pipeline_yaml_file
(
config
)
stub_ci_pipeline_yaml_file
(
config
)
end
end
...
@@ -331,7 +331,7 @@ describe Ci::CreatePipelineService, :services do
...
@@ -331,7 +331,7 @@ describe Ci::CreatePipelineService, :services do
pipeline
=
execute_service
pipeline
=
execute_service
expect
(
pipeline
).
to
be_persisted
expect
(
pipeline
).
to
be_persisted
expect
(
pipeline
.
builds
.
find_by
(
name:
'rspec'
).
retries_max
).
to
eq
3
expect
(
pipeline
.
builds
.
find_by
(
name:
'rspec'
).
retries_max
).
to
eq
2
end
end
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment