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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c68f5270
Commit
c68f5270
authored
Oct 19, 2018
by
Markus Doits
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix failing specs due to latest changes
parent
63aa35cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
spec/lib/gitlab/ci/yaml_processor_spec.rb
spec/lib/gitlab/ci/yaml_processor_spec.rb
+2
-2
spec/services/ci/process_pipeline_service_spec.rb
spec/services/ci/process_pipeline_service_spec.rb
+2
-2
No files found.
spec/lib/gitlab/ci/yaml_processor_spec.rb
View file @
c68f5270
...
@@ -53,11 +53,11 @@ module Gitlab
...
@@ -53,11 +53,11 @@ module Gitlab
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:
1
})
YAML
.
dump
(
rspec:
{
script:
'rspec'
,
retry:
{
max:
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:
1
)
expect
(
subject
[
:options
]).
to
include
(
retry:
{
max:
1
}
)
end
end
end
end
...
...
spec/services/ci/process_pipeline_service_spec.rb
View file @
c68f5270
...
@@ -671,9 +671,9 @@ describe Ci::ProcessPipelineService, '#execute' do
...
@@ -671,9 +671,9 @@ describe Ci::ProcessPipelineService, '#execute' do
context
'when builds with auto-retries are configured'
do
context
'when builds with auto-retries are configured'
do
before
do
before
do
create_build
(
'build:1'
,
stage_idx:
0
,
user:
user
,
options:
{
retry:
2
})
create_build
(
'build:1'
,
stage_idx:
0
,
user:
user
,
options:
{
retry:
{
max:
2
}
})
create_build
(
'test:1'
,
stage_idx:
1
,
user:
user
,
when: :on_failure
)
create_build
(
'test:1'
,
stage_idx:
1
,
user:
user
,
when: :on_failure
)
create_build
(
'test:2'
,
stage_idx:
1
,
user:
user
,
options:
{
retry:
1
})
create_build
(
'test:2'
,
stage_idx:
1
,
user:
user
,
options:
{
retry:
{
max:
1
}
})
end
end
it
'automatically retries builds in a valid order'
do
it
'automatically retries builds in a valid order'
do
...
...
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