remove other instance of pyargs

This commit is contained in:
Erica Portnoy 2019-11-13 16:23:29 -08:00
parent 24ebf0e078
commit 1ff5cb5908
2 changed files with 4 additions and 5 deletions

View file

@ -7,7 +7,7 @@
REPO_ROOT="letsencrypt"
LE_AUTO="$REPO_ROOT/letsencrypt-auto-source/letsencrypt-auto"
LE_AUTO="$LE_AUTO --debug --no-self-upgrade --non-interactive"
MODULES="acme certbot certbot_apache certbot_nginx"
MODULES="acme certbot certbot-apache certbot-nginx"
PIP_INSTALL="$REPO_ROOT/tools/pip_install.py"
VENV_NAME=venv
@ -22,5 +22,5 @@ cd $(mktemp -d)
for module in $MODULES ; do
echo testing $module
pytest -v --pyargs $module
pytest -v $module
done

View file

@ -30,7 +30,6 @@ SUBPKGS_NOT_IN_AUTO="certbot-dns-cloudflare certbot-dns-cloudxns certbot-dns-dig
SUBPKGS_IN_AUTO="certbot $SUBPKGS_IN_AUTO_NO_CERTBOT"
SUBPKGS_NO_CERTBOT="$SUBPKGS_IN_AUTO_NO_CERTBOT $SUBPKGS_NOT_IN_AUTO"
SUBPKGS="$SUBPKGS_IN_AUTO $SUBPKGS_NOT_IN_AUTO"
subpkgs_modules="$(echo $SUBPKGS | sed s/-/_/g)"
# certbot_compatibility_test is not packaged because:
# - it is not meant to be used by anyone else than Certbot devs
# - it causes problems when running pytest - the latter tries to
@ -177,10 +176,10 @@ mkdir kgs
kgs="kgs/$version"
pip freeze | tee $kgs
python ../tools/pip_install.py pytest
for module in $subpkgs_modules ; do
for module in $SUBPKGS ; do
echo testing $module
# use an empty configuration file rather than the one in the repo root
pytest -c <(echo '') --pyargs $module
pytest -c <(echo '') $module
done
cd ~-