Skip to content

Commit 50929f0

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

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Makefile

+8-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ 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+
2227
# Codecov CLI version to use
2328
CODECOV_CLI_VERSION := 9.0.4
2429

@@ -30,13 +35,13 @@ check-for-migration-conflicts:
3035
python manage.py check_for_migration_conflicts
3136

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

3540
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
41+
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}
3742

3843
test.integration:
39-
COVERAGE_CORE=sysmon pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy
44+
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}
4045

4146
lint:
4247
make lint.install

0 commit comments

Comments
 (0)