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

Merge pull request #15876 from edx/ret/test-output-redirect

Browse Source 
Write test output to logs, rather than to stdout to avoid blowing up …
This commit is contained in:
Calen Pennington
2017-08-23 12:56:35 -04:00
committed by GitHub
parent 83dee24410 04e67b819c
commit 8df57c7c22
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/generic-ci-tests.sh
View File

@@ -68,6 +68,8 @@ function emptyxunit {
END
}
PAVER_ARGS="--cov-args='-p' --with-xunitmp -v"
PARALLEL="--processes=-1"
case "$TEST_SUITE" in
"quality")
@@ -99,16 +101,15 @@ case "$TEST_SUITE" in
;;
"lms-unit")
PAVER_ARGS="--with-flaky --processes=-1 --cov-args='-p' --with-xunitmp"
case "$SHARD" in
"all")
paver test_system -s lms $PAVER_ARGS
paver test_system -s lms $PAVER_ARGS $PARALLEL 2> lms-tests.log
;;
[1-3])
paver test_system -s lms --attr="shard=$SHARD" $PAVER_ARGS
paver test_system -s lms --attr="shard=$SHARD" $PAVER_ARGS $PARALLEL 2> lms-tests.$SHARD.log
;;
4|"noshard")
paver test_system -s lms --attr='!shard' $PAVER_ARGS
paver test_system -s lms --attr='!shard' $PAVER_ARGS $PARALLEL 2> lms-tests.4.log
;;
*)
# If no shard is specified, rather than running all tests, create an empty xunit file. This is a
@@ -122,11 +123,11 @@ case "$TEST_SUITE" in
;;
"cms-unit")
paver test_system -s cms --with-flaky --cov-args="-p" -v --with-xunitmp
paver test_system -s cms $PAVER_ARGS 2> cms-tests.log
;;
"commonlib-unit")
paver test_lib --with-flaky --cov-args="-p" -v --with-xunit
paver test_lib $PAVER_ARGS 2> common-tests.log
;;
"js-unit")
@@ -136,7 +137,7 @@ case "$TEST_SUITE" in
"commonlib-js-unit")
paver test_js --coverage --skip-clean || { EXIT=1; }
paver test_lib --skip-clean --with-flaky --cov-args="-p" --with-xunitmp || { EXIT=1; }
paver test_lib --skip-clean $PAVER_ARGS || { EXIT=1; }
# This is to ensure that the build status of the shard is properly set.
# Because we are running two paver commands in a row, we need to capture