Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[code coverage] collect for oss integration tests #83907

Merged
merged 10 commits into from
Nov 24, 2020
Merged

[code coverage] collect for oss integration tests #83907

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
787944a
[code coverage] collect for oss integration tests
dmlemeshko Nov 20, 2020
ebdd164
do not run snapshot test modified with coverage
dmlemeshko Nov 20, 2020
a03f90a
Merge remote-tracking branch 'upstream/master' into collect-code-cove…
dmlemeshko Nov 20, 2020
6295ce1
Merge branch 'master' into collect-code-coverage-for-jest-integration…
kibanamachine Nov 21, 2020
b12a8eb
Merge remote-tracking branch 'upstream/master' into collect-code-cove…
dmlemeshko Nov 24, 2020
52526d8
skip failures
dmlemeshko Nov 24, 2020
890833b
Merge branch 'collect-code-coverage-for-jest-integration-tests' of gi…
dmlemeshko Nov 24, 2020
f7a105c
remove debug msg
dmlemeshko Nov 24, 2020
5534334
update file names
dmlemeshko Nov 24, 2020
c5e49ad
Update packages/kbn-optimizer/src/integration_tests/basic_optimizatio…
dmlemeshko Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ it('uses cache on second run and exist cleanly', async () => {
`);
});

it('prepares assets for distribution', async () => {
// test is failing since actual snapshot is modified when running with code coverage
(!!process.env.CODE_COVERAGE ? it.skip : it)('prepares assets for distribution', async () => {
spalger marked this conversation as resolved.
Show resolved Hide resolved
dmlemeshko marked this conversation as resolved.
Show resolved Hide resolved
const config = OptimizerConfig.create({
repoRoot: MOCK_REPO_DIR,
pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins'), Path.resolve(MOCK_REPO_DIR, 'x-pack')],
Expand Down
4 changes: 2 additions & 2 deletions src/dev/code_coverage/shell_scripts/fix_html_reports_parallel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ PWD=$(pwd)
du -sh $COMBINED_EXRACT_DIR

echo "### Jest: replacing path in json files"
for i in coverage-final xpack-coverage-final; do
sed -i "s|/dev/shm/workspace/kibana|${PWD}|g" $COMBINED_EXRACT_DIR/jest/${i}.json &
for i in oss oss-integration xpack; do
sed -i "s|/dev/shm/workspace/kibana|${PWD}|g" $COMBINED_EXRACT_DIR/jest/${i}-coverage-final.json &
done
wait

Expand Down
12 changes: 12 additions & 0 deletions test/scripts/jenkins_unit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,23 @@

source test/scripts/jenkins_test_setup.sh

rename_coverage_file() {
test -f target/kibana-coverage/jest/coverage-final.json \
&& mv target/kibana-coverage/jest/coverage-final.json \
target/kibana-coverage/jest/$1-coverage-final.json
}

if [[ -z "$CODE_COVERAGE" ]] ; then
"$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --dev;
else
echo " -> Running jest tests with coverage"
node scripts/jest --ci --verbose --coverage
rename_coverage_file "oss"
echo ""
echo ""
echo " -> Running jest integration tests with coverage"
node --max-old-space-size=8192 scripts/jest_integration --ci --verbose --coverage || true;
rename_coverage_file "oss-integration"
echo ""
echo ""
echo " -> Running mocha tests with coverage"
Expand Down