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

Merge pull request #12831 from cpennington/xunit-only-in-ci

Browse Source 
Clean up paver arguments
This commit is contained in:
Calen Pennington
2016-06-28 16:26:47 -04:00
committed by GitHub
parent 2b7866bfc1 0e90567f37
commit b31d1cb8ab
19 changed files with 507 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/accessibility-tests.sh
View File

@@ -16,7 +16,7 @@ echo "Setting up for accessibility tests..."
source scripts/jenkins-common.sh
echo "Running explicit accessibility tests..."
SELENIUM_BROWSER=phantomjs paver test_a11y
SELENIUM_BROWSER=phantomjs paver test_a11y --with-xunitmp
echo "Generating coverage report..."
paver a11y_coverage
@@ -24,7 +24,7 @@ paver a11y_coverage
if [ "$RUN_PA11YCRAWLER" = "1" ]
then
echo "Running pa11ycrawler against test course..."
paver pa11ycrawler --fasttest --skip_clean --fetch-course --with-html
paver pa11ycrawler --fasttest --skip-clean --fetch-course --with-html
echo "Generating coverage report..."
paver pa11ycrawler_coverage

12
scripts/circle-ci-tests.sh
View File

@@ -37,11 +37,11 @@ if [ "$CIRCLE_NODE_TOTAL" == "1" ] ; then
echo "via the CircleCI UI and adjust scripts/circle-ci-tests.sh to match."
echo "Running tests for common/lib/ and pavelib/"
paver test_lib --extra_args="--with-flaky" --cov_args="-p" || EXIT=1
paver test_lib --with-flaky --cov-args="-p" --with-xunitmp || EXIT=1
echo "Running python tests for Studio"
paver test_system -s cms --extra_args="--with-flaky" --cov_args="-p" || EXIT=1
paver test_system -s cms --with-flaky --cov-args="-p" --with-xunitmp || EXIT=1
echo "Running python tests for lms"
paver test_system -s lms --extra_args="--with-flaky" --cov_args="-p" || EXIT=1
paver test_system -s lms --with-flaky --cov-args="-p" --with-xunitmp || EXIT=1
exit $EXIT
else
@@ -74,15 +74,15 @@ else
;;
1) # run all of the lms unit tests
paver test_system -s lms --extra_args="--with-flaky" --cov_args="-p"
paver test_system -s lms --with-flaky --cov-args="-p" --with-xunitmp
;;
2) # run all of the cms unit tests
paver test_system -s cms --extra_args="--with-flaky" --cov_args="-p"
paver test_system -s cms --with-flaky --cov-args="-p" --with-xunitmp
;;
3) # run the commonlib unit tests
paver test_lib --extra_args="--with-flaky" --cov_args="-p"
paver test_lib --with-flaky --cov-args="-p" --with-xunitmp
;;
*)

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

@@ -99,23 +99,22 @@ case "$TEST_SUITE" in
;;
"lms-unit")
EXTRA_ARGS="--with-flaky"
PAVER_ARGS="--processes=-1 --cov_args='-p' -v"
PAVER_ARGS="--with-flaky --processes=-1 --cov-args='-p' -v --with-xunitmp"
case "$SHARD" in
"all")
paver test_system -s lms --extra_args="$EXTRA_ARGS" $PAVER_ARGS
paver test_system -s lms $PAVER_ARGS
;;
"1")
paver test_system -s lms --extra_args="--attr='shard_1' $EXTRA_ARGS" $PAVER_ARGS
paver test_system -s lms --attr='shard_1' $PAVER_ARGS
;;
"2")
paver test_system -s lms --extra_args="--attr='shard_2' $EXTRA_ARGS" $PAVER_ARGS
paver test_system -s lms --attr='shard_2' $PAVER_ARGS
;;
"3")
paver test_system -s lms --extra_args="--attr='shard_3' $EXTRA_ARGS" $PAVER_ARGS
paver test_system -s lms --attr='shard_3' $PAVER_ARGS
;;
"4")
paver test_system -s lms --extra_args="--attr='shard_1=False,shard_2=False,shard_3=False' $EXTRA_ARGS" $PAVER_ARGS
paver test_system -s lms --attr='shard_1=False,shard_2=False,shard_3=False' $PAVER_ARGS
;;
*)
# If no shard is specified, rather than running all tests, create an empty xunit file. This is a
@@ -129,11 +128,11 @@ case "$TEST_SUITE" in
;;
"cms-unit")
paver test_system -s cms --extra_args="--with-flaky" --cov_args="-p" -v
paver test_system -s cms --with-flaky --cov-args="-p" -v --with-xunitmp
;;
"commonlib-unit")
paver test_lib --extra_args="--with-flaky" --cov_args="-p" -v
paver test_lib --with-flaky --cov-args="-p" -v --with-xunitmp
;;
"js-unit")
@@ -142,8 +141,8 @@ case "$TEST_SUITE" in
;;
"commonlib-js-unit")
paver test_js --coverage --skip_clean || { EXIT=1; }
paver test_lib --skip_clean --extra_args="--with-flaky" --cov_args="-p" || { EXIT=1; }
paver test_js --coverage --skip-clean || { EXIT=1; }
paver test_lib --skip-clean --with-flaky --cov-args="-p" --with-xunitmp || { 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
@@ -160,11 +159,11 @@ case "$TEST_SUITE" in
;;
"lms-acceptance")
paver test_acceptance -s lms --extra_args="-v 3"
paver test_acceptance -s lms -vvv --with-xunit
;;
"cms-acceptance")
paver test_acceptance -s cms --extra_args="-v 3"
paver test_acceptance -s cms -vvv --with-xunit
;;
"bok-choy")
@@ -175,46 +174,48 @@ case "$TEST_SUITE" in
cp -R $HOME/firefox/ firefox/
export SELENIUM_FIREFOX_PATH=firefox/firefox
PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS --with-flaky --with-xunitmp"
case "$SHARD" in
"all")
paver test_bokchoy
paver test_bokchoy $PAVER_ARGS
;;
"1")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a shard_1 --with-flaky"
paver test_bokchoy --attr='shard_1' $PAVER_ARGS
;;
"2")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a 'shard_2' --with-flaky"
paver test_bokchoy --attr='shard_2' $PAVER_ARGS
;;
"3")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a 'shard_3' --with-flaky"
paver test_bokchoy --attr='shard_3' $PAVER_ARGS
;;
"4")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a 'shard_4' --with-flaky"
paver test_bokchoy --attr='shard_4' $PAVER_ARGS
;;
"5")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a 'shard_5' --with-flaky"
paver test_bokchoy --attr='shard_5' $PAVER_ARGS
;;
"6")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a 'shard_6' --with-flaky"
paver test_bokchoy --attr='shard_6' $PAVER_ARGS
;;
"7")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a 'shard_7' --with-flaky"
paver test_bokchoy --attr='shard_7' $PAVER_ARGS
;;
"8")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a 'shard_8' --with-flaky"
paver test_bokchoy --attr='shard_8' $PAVER_ARGS
;;
"9")
paver test_bokchoy -n $NUMBER_OF_BOKCHOY_THREADS --extra_args="-a shard_1=False,shard_2=False,shard_3=False,shard_4=False,shard_5=False,shard_6=False,shard_7=False,shard_8=False,a11y=False --with-flaky"
paver test_bokchoy --attr='shard_1=False,shard_2=False,shard_3=False,shard_4=False,shard_5=False,shard_6=False,shard_7=False,shard_8=False,a11y=False' $PAVER_ARGS
;;
# Default case because if we later define another bok-choy shard on Jenkins