From 107e61635c2ab1feb5263380ea63e21cf2e6e65b Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Tue, 8 Nov 2016 14:18:12 +0100
Subject: 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>
---
 run_unit_tests.sh | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'run_unit_tests.sh')

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index bbe95cc8c..e050418c5 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
-- 
cgit 1.2.3-korg