Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Commit 57e647b

Browse files
committed
emit junit results in a monorepo-friendly way
1 parent d203ad3 commit 57e647b

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

Makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ export CODECOV_TOKEN=${CODECOV_UPLOAD_TOKEN}
1919
API_DOMAIN ?= api
2020
PROXY_NETWORK ?= api_default
2121

22+
# We allow this to be overridden so that we can run `pytest` from this directory
23+
# but have the junit file use paths relative to a parent directory. This will
24+
# help us move to a monorepo.
25+
PYTEST_ROOTDIR ?= "."
26+
27+
aaa:
28+
echo ${PYTEST_ROOTDIR}
29+
2230
# Codecov CLI version to use
2331
CODECOV_CLI_VERSION := 9.0.4
2432

@@ -30,13 +38,13 @@ check-for-migration-conflicts:
3038
python manage.py check_for_migration_conflicts
3139

3240
test:
33-
COVERAGE_CORE=sysmon pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy
41+
COVERAGE_CORE=sysmon pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
3442

3543
test.unit:
36-
COVERAGE_CORE=sysmon pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy
44+
COVERAGE_CORE=sysmon pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
3745

3846
test.integration:
39-
COVERAGE_CORE=sysmon pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy
47+
COVERAGE_CORE=sysmon pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
4048

4149
lint:
4250
make lint.install
@@ -211,7 +219,7 @@ test_env.container_check_db:
211219
while ! nc -vz timescale 5432; do sleep 1; echo "waiting for timescale"; done
212220

213221
test_env.run_unit:
214-
docker compose exec api make test.unit
222+
docker compose exec api make test.unit -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
215223

216224
test_env.run_integration:
217225
# docker compose exec api make test.integration

0 commit comments

Comments
 (0)