Skip to content

Commit

Permalink
Try to fix py.test --rootdir issue when passing in -c argument
Browse files Browse the repository at this point in the history
  • Loading branch information
ktbyers committed Jul 12, 2022
1 parent 792e70d commit d727110
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
4 changes: 1 addition & 3 deletions docs/build-ansible-module-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
CWD=`pwd`
MODULES_OUTPUT="$CWD/integrations/ansible/modules/source"



git clone https://github.com/napalm-automation/napalm-ansible.git napalm_ansible_repo
cd napalm_ansible_repo

Expand All @@ -13,7 +11,7 @@ git checkout develop

pip install -r requirements-dev.txt
pip install .
py.test -c /dev/null
py.test
cp module_docs/* $MODULES_OUTPUT/

cd $CWD
Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ sphinxcontrib-napoleon
invoke
jinja2==2.11.3
MarkupSafe==2.0.1
pytest==6.2.5
ansible==4.10.0
2 changes: 1 addition & 1 deletion docs/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TEST_RESULTS_PATH="$CWD/support/tests"

if [ ! -f "report.json" ]; then
set -e
py.test -c /dev/null --cov=./ -vs --json=report.json ../test*/*/test_getters.py
py.test --cov=./ -vs --json=report.json ../test*/*/test_getters.py

set -e
cp report.json $TEST_RESULTS_PATH/report.json
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ black==22.6.0
coveralls==3.3.1
ddt==1.5.0
flake8-import-order==0.18.1
pytest==6.2.5
pytest==7.1.2
pytest-cov==3.0.0
pytest-json==0.4.0
pylama==8.2.1
Expand Down

0 comments on commit d727110

Please sign in to comment.