From dfaa2a0f4f3bead508eaa32aab49fef7b590a6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=98=B8?= <😸@43-1.org> Date: Sun, 30 Aug 2020 13:51:14 +0200 Subject: [PATCH] tests: use `python3-coverage` in Python 3 tests --- setup/dak-setup.sh | 7 ++++++- tests/run-dbtests | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/setup/dak-setup.sh b/setup/dak-setup.sh index 88a06920..b18eb6be 100755 --- a/setup/dak-setup.sh +++ b/setup/dak-setup.sh @@ -37,7 +37,12 @@ dak-setup() { SYS_CMD="" USER_CMD="" if [ "$RUN_COVERAGE" = "y" ]; then - PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode" + if [ "${DAK_PYTHON3:-n}" = "y" ]; then + COVERAGE_CMD=python3-coverage + else + COVERAGE_CMD=python-coverage + fi + PYTHON_COVERAGE="${COVERAGE_CMD} run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode" else PYTHON_COVERAGE= fi diff --git a/tests/run-dbtests b/tests/run-dbtests index 87ee2bed..d6bdfb2b 100755 --- a/tests/run-dbtests +++ b/tests/run-dbtests @@ -24,7 +24,12 @@ else KEEP_ENV_OPT="" USER_CMD="" if [ "$RUN_COVERAGE" = "y" ]; then - PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode" + if [ "${DAK_PYTHON3:-n}" = "y" ]; then + COVERAGE_CMD=python3-coverage + else + COVERAGE_CMD=python-coverage + fi + PYTHON_COVERAGE="${COVERAGE_CMD} run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode" else PYTHON_COVERAGE= fi -- GitLab