diff --git a/.gitignore b/.gitignore index 63ee37a5354b7f0c851316bed0c407e3a207672a..c56a97137bdaa46c135cdca31212c4dd78a81a32 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,7 @@ htmlcov/ .tox/ .nox/ .coverage -.coveragerc.final +.coveragerc .coverage.* .cache nosetests.xml diff --git a/coverage/.coveragerc b/coverage/.coveragerc.template similarity index 100% rename from coverage/.coveragerc rename to coverage/.coveragerc.template diff --git a/report_coverage_all.sh b/report_coverage_all.sh index 72c1be7dcc9baa860a65955a699cf9de56dbd941..66e393747ee86afee9e407da902ea3fb0421d707 100755 --- a/report_coverage_all.sh +++ b/report_coverage_all.sh @@ -3,7 +3,7 @@ PROJECTDIR=`pwd` cd $(dirname $0)/src -RCFILE=$PROJECTDIR/controller/coverage/.coveragerc +RCFILE=$PROJECTDIR/coverage/.coveragerc echo echo "Coverage report:" diff --git a/run_local_tests.sh b/run_local_tests.sh index 123ed93856462c6e197d557dfa5aa8352d8a4374..47c62c1508135fea3fbd950ad2f64cfb663409f6 100755 --- a/run_local_tests.sh +++ b/run_local_tests.sh @@ -3,11 +3,11 @@ PROJECTDIR=`pwd` cd $(dirname $0)/src -RCFILE=$PROJECTDIR/coverage/.coveragerc.final +RCFILE=$PROJECTDIR/coverage/.coveragerc COVERAGEFILE=$PROJECTDIR/coverage/.coverage # configure the correct folder on the .coveragerc file -cat $PROJECTDIR/coverage/.coveragerc | sed s+~/teraflow/controller+$PROJECTDIR+g > $RCFILE +cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PROJECTDIR+g > $RCFILE # Run unitary tests and analyze coverage of code at same time @@ -38,5 +38,3 @@ export REDIS_DATABASE_ID='0' coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ common/database/tests/test_engine_redis.py \ tester_integration/test_context_device_service.py - -rm $RCFILE