فهرست منبع

Switch to read-only container filesystem to avoid *.pyc getting created with busted permissions.

Dan Helfman 5 سال پیش
والد
کامیت
c6cb21a748
4فایلهای تغییر یافته به همراه12 افزوده شده و 8 حذف شده
  1. 2 1
      scripts/run-full-dev-tests
  2. 4 3
      scripts/run-full-tests
  3. 3 1
      tests/end-to-end/docker-compose.yaml
  4. 3 3
      tox.ini

+ 2 - 1
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

+ 4 - 3
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

+ 3 - 1
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:

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