diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 000000000..3ecec1912 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,2 @@ +[pytest] +addopts = --numprocesses auto --pyargs diff --git a/tools/install_and_test.sh b/tools/install_and_test.sh index 819f683aa..e84fbc99e 100755 --- a/tools/install_and_test.sh +++ b/tools/install_and_test.sh @@ -14,6 +14,7 @@ fi temp_cwd=$(mktemp -d) trap "rm -rf $temp_cwd" EXIT +cp pytest.ini "$temp_cwd" set -x for requirement in "$@" ; do @@ -24,6 +25,6 @@ for requirement in "$@" ; do pkg="certbot" fi cd "$temp_cwd" - pytest --numprocesses auto --quiet --pyargs $pkg + pytest --quiet $pkg cd - done diff --git a/tox.cover.sh b/tox.cover.sh index c713327c5..7da2d6b1f 100755 --- a/tox.cover.sh +++ b/tox.cover.sh @@ -61,7 +61,7 @@ cover () { fi pkg_dir=$(echo "$1" | tr _ -) - pytest --cov "$pkg_dir" --cov-append --cov-report= --numprocesses auto --pyargs "$1" + pytest --cov "$pkg_dir" --cov-append --cov-report= "$1" coverage report --fail-under="$min" --include="$pkg_dir/*" --show-missing }