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

Name coverage data files so they won't overwrite each other.

Browse Source
This commit is contained in:
Ned Batchelder
2019-07-16 07:05:53 -04:00
parent c8c39c613d
commit 12ca7b8ab7
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.coveragerc
View File

@@ -1,6 +1,6 @@
# .coveragerc for edx-platform
[run]
data_file = reports/.coverage
data_file = reports/${TEST_SUITE}.coverage
source =
cms
common/djangoapps

3
pavelib/utils/test/suites/suite.py
View File

@@ -4,6 +4,7 @@ A class used for defining and running test suites
"""
from __future__ import absolute_import, print_function
import os
import subprocess
import sys
@@ -93,6 +94,8 @@ class TestSuite(object):
sys.stdout.write(msg)
sys.stdout.flush()
if 'TEST_SUITE' not in os.environ:
os.environ['TEST_SUITE'] = self.root.replace("/", "_")
kwargs = {'shell': True, 'cwd': None}
process = None

18
scripts/unit-tests.sh
View File

@@ -56,15 +56,15 @@ case "${TEST_SUITE}" in
case "$SHARD" in
"all")
paver test_system -s lms --disable_capture ${PAVER_ARGS} ${PARALLEL} 2> lms-tests.log
mv reports/.coverage reports/.coverage.lms
mv reports/${TEST_SUITE}.coverage reports/.coverage.lms
;;
[1-9])
paver test_system -s lms --disable_capture --eval-attr="shard==$SHARD" ${PAVER_ARGS} ${PARALLEL} 2> lms-tests.${SHARD}.log
mv reports/.coverage reports/.coverage.lms.${SHARD}
mv reports/${TEST_SUITE}.coverage reports/.coverage.lms.${SHARD}
;;
10|"noshard")
paver test_system -s lms --disable_capture --eval-attr="shard>=$SHARD or not shard" ${PAVER_ARGS} ${PARALLEL} 2> lms-tests.10.log
mv reports/.coverage reports/.coverage.lms.10
mv reports/${TEST_SUITE}.coverage reports/.coverage.lms.10
;;
*)
# If no shard is specified, rather than running all tests, create an empty xunit file. This is a
@@ -81,15 +81,15 @@ case "${TEST_SUITE}" in
case "$SHARD" in
"all")
paver test_system -s cms --disable_capture ${PAVER_ARGS} ${PARALLEL} 2> cms-tests.log
mv reports/.coverage reports/.coverage.cms
mv reports/${TEST_SUITE}.coverage reports/.coverage.cms
;;
1)
paver test_system -s cms --disable_capture --eval-attr="shard==$SHARD" ${PAVER_ARGS} 2> cms-tests.${SHARD}.log
mv reports/.coverage reports/.coverage.cms.${SHARD}
mv reports/${TEST_SUITE}.coverage reports/.coverage.cms.${SHARD}
;;
2|"noshard")
paver test_system -s cms --disable_capture --eval-attr="shard>=$SHARD or not shard" ${PAVER_ARGS} 2> cms-tests.2.log
mv reports/.coverage reports/.coverage.cms.2
mv reports/${TEST_SUITE}.coverage reports/.coverage.cms.2
;;
*)
# If no shard is specified, rather than running all tests, create an empty xunit file. This is a
@@ -106,15 +106,15 @@ case "${TEST_SUITE}" in
case "$SHARD" in
"all")
paver test_lib --disable_capture ${PAVER_ARGS} ${PARALLEL} 2> common-tests.log
mv reports/.coverage reports/.coverage.commonlib
mv reports/${TEST_SUITE}.coverage reports/.coverage.commonlib
;;
[1-2])
paver test_lib -l common/lib/xmodule --disable_capture --eval-attr="shard==$SHARD" ${PAVER_ARGS} 2> common-tests.${SHARD}.log
mv reports/.coverage reports/.coverage.commonlib.${SHARD}
mv reports/${TEST_SUITE}.coverage reports/.coverage.commonlib.${SHARD}
;;
3|"noshard")
paver test_lib --disable_capture --eval-attr="shard>=$SHARD or not shard" ${PAVER_ARGS} 2> common-tests.3.log
mv reports/.coverage reports/.coverage.commonlib.3
mv reports/${TEST_SUITE}.coverage reports/.coverage.commonlib.3
;;
*)
# If no shard is specified, rather than running all tests, create an empty xunit file. This is a