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

fix bok-choy reporting on failure

Browse Source
This commit is contained in:
Christine Lytwynec
2015-03-02 15:24:15 -05:00
parent 57f051b5b2
commit 6c93997962
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/all-tests.sh
View File

@@ -95,13 +95,13 @@ END
"unit")
case "$SHARD" in
"lms")
paver test_system -s lms --extra_args="--with-flaky"
paver test_system -s lms --extra_args="--with-flaky" || { EXIT=1; }
paver coverage
;;
"cms-js-commonlib")
paver test_system -s cms --extra_args="--with-flaky"
paver test_js --coverage --skip_clean
paver test_lib --skip_clean --extra_args="--with-flaky"
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
;;
*)
@@ -109,6 +109,8 @@ END
paver coverage
;;
esac
exit $EXIT
;;
"lms-acceptance")
@@ -158,23 +160,23 @@ END
case "$SHARD" in
"all")
paver test_bokchoy
paver test_bokchoy || { EXIT=1; }
;;
"1")
paver test_bokchoy --extra_args="-a shard_1 --with-flaky"
paver test_bokchoy --extra_args="-a shard_1 --with-flaky" || { EXIT=1; }
;;
"2")
paver test_bokchoy --extra_args="-a 'shard_2' --with-flaky"
paver test_bokchoy --extra_args="-a 'shard_2' --with-flaky" || { EXIT=1; }
;;
"3")
paver test_bokchoy --extra_args="-a 'shard_3' --with-flaky"
paver test_bokchoy --extra_args="-a 'shard_3' --with-flaky" || { EXIT=1; }
;;
"4")
paver test_bokchoy --extra_args="-a shard_1=False,shard_2=False,shard_3=False --with-flaky"
paver test_bokchoy --extra_args="-a shard_1=False,shard_2=False,shard_3=False --with-flaky" || { EXIT=1; }
;;
# Default case because if we later define another bok-choy shard on Jenkins
@@ -197,6 +199,15 @@ 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