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
5c600866
Commit
5c600866
authored
Nov 16, 2021
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong require in spec/support/flaky_tests.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
be656e39
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+1
-0
scripts/rspec_helpers.sh
scripts/rspec_helpers.sh
+1
-0
spec/support/flaky_tests.rb
spec/support/flaky_tests.rb
+1
-1
No files found.
.gitlab/ci/rails.gitlab-ci.yml
View file @
5c600866
...
@@ -579,6 +579,7 @@ rspec:skipped-flaky-tests-report:
...
@@ -579,6 +579,7 @@ rspec:skipped-flaky-tests-report:
variables
:
variables
:
SKIPPED_FLAKY_TESTS_REPORT
:
skipped_flaky_tests_report.txt
SKIPPED_FLAKY_TESTS_REPORT
:
skipped_flaky_tests_report.txt
before_script
:
before_script
:
-
'
echo
"SKIP_FLAKY_TESTS_AUTOMATICALLY:
$SKIP_FLAKY_TESTS_AUTOMATICALLY"'
-
mkdir -p rspec_flaky
-
mkdir -p rspec_flaky
script
:
script
:
-
find rspec_flaky/ -type f -name 'skipped_flaky_tests_*_report.txt' -exec cat {} + >> "${SKIPPED_FLAKY_TESTS_REPORT}"
-
find rspec_flaky/ -type f -name 'skipped_flaky_tests_*_report.txt' -exec cat {} + >> "${SKIPPED_FLAKY_TESTS_REPORT}"
...
...
scripts/rspec_helpers.sh
View file @
5c600866
...
@@ -159,6 +159,7 @@ function rspec_paralellized_job() {
...
@@ -159,6 +159,7 @@ function rspec_paralellized_job() {
fi
fi
echo
"KNAPSACK_TEST_FILE_PATTERN:
${
KNAPSACK_TEST_FILE_PATTERN
}
"
echo
"KNAPSACK_TEST_FILE_PATTERN:
${
KNAPSACK_TEST_FILE_PATTERN
}
"
echo
"SKIP_FLAKY_TESTS_AUTOMATICALLY:
${
SKIP_FLAKY_TESTS_AUTOMATICALLY
}
"
if
[[
-d
"ee/"
]]
;
then
if
[[
-d
"ee/"
]]
;
then
export
KNAPSACK_GENERATE_REPORT
=
"true"
export
KNAPSACK_GENERATE_REPORT
=
"true"
...
...
spec/support/flaky_tests.rb
View file @
5c600866
...
@@ -4,7 +4,7 @@ return unless ENV['CI']
...
@@ -4,7 +4,7 @@ return unless ENV['CI']
return
unless
ENV
[
'SKIP_FLAKY_TESTS_AUTOMATICALLY'
]
==
"true"
return
unless
ENV
[
'SKIP_FLAKY_TESTS_AUTOMATICALLY'
]
==
"true"
return
if
ENV
[
'CI_MERGE_REQUEST_LABELS'
].
to_s
.
include?
(
'pipeline:run-flaky-tests'
)
return
if
ENV
[
'CI_MERGE_REQUEST_LABELS'
].
to_s
.
include?
(
'pipeline:run-flaky-tests'
)
require_relative
'../tooling/rspec_flaky/report'
require_relative
'../
../
tooling/rspec_flaky/report'
RSpec
.
configure
do
|
config
|
RSpec
.
configure
do
|
config
|
$flaky_test_example_ids
=
begin
# rubocop:disable Style/GlobalVars
$flaky_test_example_ids
=
begin
# rubocop:disable Style/GlobalVars
...
...
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