From 42453af83de2fc2a92abb7fb0c32468f53e64261 Mon Sep 17 00:00:00 2001
From: Carlos Natalino <carlos.natalino@chalmers.se>
Date: Tue, 5 Oct 2021 08:21:47 +0000
Subject: [PATCH] Modifying the name of the template coveragerc file and
 updating scripts accordingly.

---
 .gitignore                                     | 2 +-
 coverage/{.coveragerc => .coveragerc.template} | 0
 report_coverage_all.sh                         | 2 +-
 run_local_tests.sh                             | 6 ++----
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename coverage/{.coveragerc => .coveragerc.template} (100%)

diff --git a/.gitignore b/.gitignore
index 63ee37a53..c56a97137 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 72c1be7dc..66e393747 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 123ed9385..47c62c150 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
-- 
GitLab