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
a90781f9
Commit
a90781f9
authored
Feb 16, 2022
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set $rspec_run_status properly
parent
6dfa934b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
scripts/rspec_helpers.sh
scripts/rspec_helpers.sh
+3
-2
No files found.
scripts/rspec_helpers.sh
View file @
a90781f9
...
@@ -279,7 +279,8 @@ function rspec_paralellized_job() {
...
@@ -279,7 +279,8 @@ function rspec_paralellized_job() {
# Experiment to retry failed examples in a new RSpec process: https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1148
# Experiment to retry failed examples in a new RSpec process: https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1148
if
[[
$rspec_run_status
-ne
0
]]
;
then
if
[[
$rspec_run_status
-ne
0
]]
;
then
if
[[
"
${
RETRY_FAILED_TESTS_IN_NEW_PROCESS
}
"
==
"true"
]]
;
then
if
[[
"
${
RETRY_FAILED_TESTS_IN_NEW_PROCESS
}
"
==
"true"
]]
;
then
$rspec_run_status
=
$(
retry_failed_rspec_examples
)
retry_failed_rspec_examples
rspec_run_status
=
$?
fi
fi
else
else
echosuccess
"No examples to retry, congrats!"
echosuccess
"No examples to retry, congrats!"
...
@@ -310,7 +311,7 @@ function retry_failed_rspec_examples() {
...
@@ -310,7 +311,7 @@ function retry_failed_rspec_examples() {
# Merge the JUnit report from retry into the first-try report
# Merge the JUnit report from retry into the first-try report
junit_merge
"
${
JUNIT_RETRY_FILE
}
"
"
${
JUNIT_RESULT_FILE
}
"
junit_merge
"
${
JUNIT_RETRY_FILE
}
"
"
${
JUNIT_RESULT_FILE
}
"
return
$rspec_run_status
exit
$rspec_run_status
}
}
function
rspec_rerun_previous_failed_tests
()
{
function
rspec_rerun_previous_failed_tests
()
{
...
...
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