Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7709 from edx/clytwynec/unique-dirs-for-test-results

Browse Source 
Clytwynec/unique dirs for test results
This commit is contained in:
Christine Lytwynec
2015-05-04 08:55:38 -04:00
parent 7a1060cf56 67ee646989
commit 4f5aeb3f49
6 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/all-tests.sh
View File

@@ -98,14 +98,12 @@ END
"unit")
case "$SHARD" in
"lms")
paver test_system -s lms --extra_args="--with-flaky" || { EXIT=1; }
paver coverage
SHARD=1 paver test_system -s lms --extra_args="--with-flaky" --cov_args="-p" || { EXIT=1; }
;;
"cms-js-commonlib")
paver test_system -s cms --extra_args="--with-flaky" || { EXIT=1; }
paver test_js --coverage --skip_clean || { EXIT=1; }
paver test_lib --skip_clean --extra_args="--with-flaky" || { EXIT=1; }
paver coverage
SHARD=1 paver test_system -s cms --extra_args="--with-flaky" --cov_args="-p" || { EXIT=1; }
SHARD=1 paver test_js --coverage --skip_clean || { EXIT=1; }
SHARD=1 paver test_lib --skip_clean --extra_args="--with-flaky" --cov_args="-p" || { EXIT=1; }
;;
*)
paver test --extra_args="--with-flaky"
@@ -210,15 +208,4 @@ END
END
;;
esac
# Move the reports to a directory that is unique to the shard
# so that when they are 'slurped' to the main flow job, they
# do not conflict with and overwrite reports from other shards.
mv reports/ reports_tmp/
mkdir -p reports/${TEST_SUITE}/${SHARD}
mv reports_tmp/* reports/${TEST_SUITE}/${SHARD}
rm -r reports_tmp/
exit $EXIT
;;
esac

7
scripts/jenkins-report.sh
View File

@@ -1,8 +1,11 @@
#!/usr/bin/env bash
source scripts/jenkins-common.sh
# Run coverage again to get the diff coverage report
paver diff_coverage
# Combine the data files that were generated using -p
paver combine_coverage
# Get the diff coverage and html reports for unit tests
paver coverage
# JUnit test reporter will fail the build
# if it thinks test results are old