diff --git a/scripts/run-full-dev-tests b/scripts/run-full-dev-tests index 2c69a09fc..2c682f021 100755 --- a/scripts/run-full-dev-tests +++ b/scripts/run-full-dev-tests @@ -10,4 +10,5 @@ set -e -docker-compose --file tests/end-to-end/docker-compose.yaml up --abort-on-container-exit +docker-compose --file tests/end-to-end/docker-compose.yaml up --force-recreate \ + --abort-on-container-exit diff --git a/scripts/run-full-tests b/scripts/run-full-tests index a88b4a454..21035ee43 100755 --- a/scripts/run-full-tests +++ b/scripts/run-full-tests @@ -11,7 +11,8 @@ set -e python -m pip install --upgrade pip==19.3.1 -pip install tox==3.14.0 -tox +pip install tox==3.14.1 +export COVERAGE_FILE=/tmp/.coverage +tox --workdir /tmp/.tox apk add --no-cache borgbackup postgresql-client mariadb-client -tox --workdir /tmp -e end-to-end +tox --workdir /tmp/.tox -e end-to-end diff --git a/tests/end-to-end/docker-compose.yaml b/tests/end-to-end/docker-compose.yaml index 1e7ad5823..156596a8f 100644 --- a/tests/end-to-end/docker-compose.yaml +++ b/tests/end-to-end/docker-compose.yaml @@ -13,7 +13,9 @@ services: tests: image: python:3.7-alpine3.10 volumes: - - "../..:/app" + - "../..:/app:ro" + tmpfs: + - "/app/borgmatic.egg-info" tty: true working_dir: /app command: diff --git a/tox.ini b/tox.ini index 8d453c212..b6b0537d9 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py35,py36,py37,py38 skip_missing_interpreters = True skipsdist = True -minversion = 3.14.0 +minversion = 3.14.1 [testenv] usedevelop = True @@ -10,8 +10,7 @@ deps = -rtest_requirements.txt whitelist_externals = find sh -commands_pre = - find {envdir} -type f -not -path '*/__pycache__/*' -name '*.py[c|o]' -delete +passenv = COVERAGE_FILE commands = pytest {posargs} py36,py37,py38: black --check . @@ -28,6 +27,7 @@ commands = [testenv:end-to-end] deps = -rtest_requirements.txt +passenv = COVERAGE_FILE commands = pytest {posargs} --no-cov tests/end-to-end