ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-18 02:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Go straight to subunit v2

Browse Source
This commit is contained in:
Jean-Paul Calderone 2018-07-06 15:27:03 -04:00
parent a8e1ff407d
commit 869a6ad390
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.circleci/run-tests.sh
View File

@ -13,7 +13,6 @@ shift || :
sudo --user nobody mkdir -p "${ARTIFACTS}" sudo --user nobody mkdir -p "${ARTIFACTS}"
TOX_JSON="${ARTIFACTS}"/tox-result.json TOX_JSON="${ARTIFACTS}"/tox-result.json
SUBUNIT1="${ARTIFACTS}"/results.subunit1
SUBUNIT2="${ARTIFACTS}"/results.subunit2 SUBUNIT2="${ARTIFACTS}"/results.subunit2
# Use an intermediate directory here because CircleCI extracts some label # Use an intermediate directory here because CircleCI extracts some label
@ -27,7 +26,7 @@ JUNITXML="${ARTIFACTS}"/junit/unittests/results.xml
# Also run with /tmp as a workdir because the non-root user won't be able to # Also run with /tmp as a workdir because the non-root user won't be able to
# create the tox working filesystem state in the source checkout because it is # create the tox working filesystem state in the source checkout because it is
# owned by root. # owned by root.
sudo TAHOE_LAFS_TRIAL_ARGS="--reporter=subunit" \ sudo TAHOE_LAFS_TRIAL_ARGS="--reporter=subunitv2" \
--set-home \ --set-home \
--user nobody \ --user nobody \
/tmp/tests/bin/tox \ /tmp/tests/bin/tox \
@ -37,7 +36,7 @@ sudo TAHOE_LAFS_TRIAL_ARGS="--reporter=subunit" \
-e "${TAHOE_LAFS_TOX_ENVIRONMENT}" \ -e "${TAHOE_LAFS_TOX_ENVIRONMENT}" \
${TAHOE_LAFS_TOX_ARGS} ${TAHOE_LAFS_TOX_ARGS}
# Extract the test process output which should be subunit1-format. # Extract the test process output which should be subunit2-format.
/tmp/tests/bin/python -c ' /tmp/tests/bin/python -c '
from json import load from json import load
from sys import stdin, stdout, argv from sys import stdin, stdout, argv
@ -52,10 +51,7 @@ for environ in argv[1].split(","):
) )
messy_output = test_result["output"] messy_output = test_result["output"]
stdout.write(messy_output.split("\n", 3)[3].strip() + "\n") stdout.write(messy_output.split("\n", 3)[3].strip() + "\n")
' "${TAHOE_LAFS_TOX_ENVIRONMENT}" < "${TOX_JSON}" > "${SUBUNIT1}" ' "${TAHOE_LAFS_TOX_ENVIRONMENT}" < "${TOX_JSON}" > "${SUBUNIT2}"
# Upgrade subunit version because subunit2junitxml only works on subunit2
/tmp/tests/bin/subunit-1to2 < "${SUBUNIT1}" > "${SUBUNIT2}"
# Create a junitxml results area. # Create a junitxml results area.
mkdir -p "$(dirname "${JUNITXML}")" mkdir -p "$(dirname "${JUNITXML}")"

2
.circleci/setup-virtualenv.sh
View File

@ -16,7 +16,7 @@ TEST_DEPS="tox codecov"
# Python packages we need to generate test reports for CI infrastructure. # Python packages we need to generate test reports for CI infrastructure.
# *Not* packages Tahoe-LAFS itself (implement or test suite) need. # *Not* packages Tahoe-LAFS itself (implement or test suite) need.
REPORTING_DEPS="python-subunit junitxml" REPORTING_DEPS="python-subunit junitxml subunitreporter"
sudo --set-home -u nobody /tmp/tests/bin/pip install ${TEST_DEPS} ${REPORTING_DEPS} sudo --set-home -u nobody /tmp/tests/bin/pip install ${TEST_DEPS} ${REPORTING_DEPS}