diff options
| author | Brad Warren <bmw@eff.org> | 2018-01-05 01:26:28 +0300 |
|---|---|---|
| committer | Brad Warren <bmw@eff.org> | 2018-01-05 01:26:28 +0300 |
| commit | 504c5e0453a041e169c1e815ab58abb9ab6b0fae (patch) | |
| tree | 32dca040165b2bb63f35f9647125c61670bb8b5a | |
| parent | ee2dc5c44979c952b514c334a2653a572e2e5723 (diff) | |
test moar thingstest-everything-test
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | tools/install_and_test.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index fee0a65d9..bc393eb95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: - cp .travis.yml /tmp/travis.yml - git pull origin master --strategy=recursive --strategy-option=theirs --no-edit - if ! git diff .travis.yml /tmp/travis.yml ; then echo "Please merge master into test-everything"; exit 1; fi + - rm pytest.ini - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3)' before_script: diff --git a/tools/install_and_test.sh b/tools/install_and_test.sh index 317cab0eb..df6e55f47 100755 --- a/tools/install_and_test.sh +++ b/tools/install_and_test.sh @@ -22,5 +22,5 @@ for requirement in "$@" ; do # See https://travis-ci.org/certbot/certbot/jobs/308774157#L1333. pkg=$(echo "$pkg" | tr - _) fi - PYTEST_DEBUG=1 pytest --numprocesses 2 -vvvv --pyargs $pkg + PYTEST_DEBUG=1 pytest --max-slave-restart 0 --numprocesses auto -vvvv --pyargs $pkg done |