tests: use `python3-coverage` in Python 3 tests

dfaa2a0f · 😸 · ea3fea18 · dfaa2a0f · dfaa2a0f
隐藏空白更改
内联并排

Showing with 12 addition and 2 deletion

setup/dak-setup.sh setup/dak-setup.sh +6 -1

tests/run-dbtests tests/run-dbtests +6 -1

未找到文件。
--- 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

--- 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