aboutsummaryrefslogtreecommitdiffstats
path: root/run_unit_tests.sh
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-11-08 14:18:12 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2016-11-09 16:55:45 +0100
commit107e61635c2ab1feb5263380ea63e21cf2e6e65b (patch)
tree4966b77605bd34a40f452b1d268868691e84d008 /run_unit_tests.sh
parente74c9b347f2623eb1a3c477921a84da4c31b364f (diff)
Repo structure modification
- create functest subdirectory - rename unit tests - adapt path in exec and config files JIRA: FUNCTEST-525 Change-Id: Ifd5c6edfb5bda1b09f82848e2269ad5fbeb84d0a Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Diffstat (limited to 'run_unit_tests.sh')
-rwxr-xr-xrun_unit_tests.sh25
1 files changed, 1 insertions, 24 deletions
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index bbe95cc8..e050418c 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -25,25 +25,9 @@ sudo touch /home/opnfv/functest/results/odl/stdout.txt
sudo chmod -Rf a+rw /home/opnfv
# Either Workspace is set (CI)
-# then useless log files must belong to jenkins:jenkins
-# or it is local tests and we do not care
if [ -z $WORKSPACE ]
then
WORKSPACE="."
-else
- sudo chown -Rf jenkins:jenkins /home/opnfv
- # as we import the module from the home repo
- # and in jenkins the name is different
- # functest-verify-master != functest
- # make some ugly adjustments...
- cd $WORKSPACE
- export PYTHONPATH="${PYTHONPATH}:$WORKSPACE"
- cd ..
-
- if [ ! -d "./functest" ]
- then
- ln -s functest-verify-master functest
- fi
fi
@@ -74,7 +58,7 @@ nosetests --with-xunit \
--cover-package=functest.testcases.Controllers.ODL.OpenDaylightTesting \
--cover-xml \
--cover-html \
- unit_tests
+ functest/tests/unit
rc=$?
deactivate
@@ -82,13 +66,6 @@ deactivate
# *******
# clean
# *******
-# First as we had to start the test from ..
-# Push the results upstream for jenkins
-if [ $WORKSPACE != "." ]
-then
- mv coverage.xml nosetests.xml $WORKSPACE
-fi
-
# Clean useless logs
if [ -d "/home/opnfv/functest/results" ]
then