Skip to content
Snippets Groups Projects

run.sh: swap the order of (non-)monotonic tests

Merged Vladimír Čunát requested to merge ci-test-reports into master
Compare and
1 file
+ 2
2
Preferences
Compare changes
+ 2
2
@@ -3,10 +3,10 @@ MAKEDIR="$(dirname "$0")"
# Currently there no tests requiring faking monotonic time in this repository (there are some elsewhere)
# pytest returns code 5 on "no tests were run" so we just ignore it
faketime -m --exclude-monotonic "" python3 -m pytest -c "${MAKEDIR}/deckard_pytest.ini" --tb=short -q ${VERBOSE:+"--log-level=DEBUG"} "${MAKEDIR}" ${DECKARDFLAGS:-} ${TESTS:+"--scenarios=${TESTS}"} -m "not monotonic" --boxed "$@"
NONMONO_RES=$(( $? == 5 ? 0 : $? ))
faketime -m "" python3 -m pytest -c "${MAKEDIR}/deckard_pytest.ini" --tb=short -q ${VERBOSE:+"--log-level=DEBUG"} "${MAKEDIR}" ${DECKARDFLAGS:-} ${TESTS:+"--scenarios=${TESTS}"} -m "monotonic" --boxed "$@"
MONO_RES=$(( $? == 5 ? 0 : $? ))
faketime -m --exclude-monotonic "" python3 -m pytest -c "${MAKEDIR}/deckard_pytest.ini" --tb=short -q ${VERBOSE:+"--log-level=DEBUG"} "${MAKEDIR}" ${DECKARDFLAGS:-} ${TESTS:+"--scenarios=${TESTS}"} -m "not monotonic" --boxed "$@"
NONMONO_RES=$(( $? == 5 ? 0 : $? ))
if [ $NONMONO_RES -ne 0 ]
then