From 41fe40506845ba7de38a7ddf3995c781794838fc Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 14 Aug 2020 13:09:56 -0400 Subject: [PATCH 1/2] news fragment --- newsfragments/3380.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3380.minor diff --git a/newsfragments/3380.minor b/newsfragments/3380.minor new file mode 100644 index 000000000..e69de29bb From 6eba1469f3b7c707e2f5678b4960c6c0cfb8299e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 14 Aug 2020 13:10:54 -0400 Subject: [PATCH 2/2] Back out subunit2junitxml exit status change from ticket:3336 I don't know why I included this change. It was certainly based on a faulty assumption (that the tox command would exit with error if a test failed - it won't). Apart from that, the motivation was the Python 3.6 ratchet job. The test run was expected to fail but then the *ratchet* tool was in charge of deciding if this indicated real failure or not. Failing at this point prevented that logic from running. Now the ratchet is gone and we want CI to turn red if anything fails. --- .circleci/run-tests.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh index bf1b6ee8e..48f500280 100755 --- a/.circleci/run-tests.sh +++ b/.circleci/run-tests.sh @@ -88,9 +88,5 @@ if [ -n "${ARTIFACTS}" ]; then # Create a junitxml results area. mkdir -p "$(dirname "${JUNITXML}")" - # Always succeed even if subunit2junitxml fails. subunit2junitxml signals - # failure if the stream it is processing contains test failures. This is - # not what we care about. If we cared about it, the test command above - # would have signalled failure already and we wouldn't be here. - "${BOOTSTRAP_VENV}"/bin/subunit2junitxml < "${SUBUNIT2}" > "${JUNITXML}" || true + "${BOOTSTRAP_VENV}"/bin/subunit2junitxml < "${SUBUNIT2}" > "${JUNITXML}" || "${alternative}" fi