summaryrefslogtreecommitdiffstats
path: root/run_tests.sh
diff options
context:
space:
mode:
authorDeepak S <deepak.s@linux.intel.com>2017-06-20 14:31:19 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-08-08 08:54:23 -0700
commit5ce3b6f8c8b3217091e51a6041455738603d90b8 (patch)
treeca34e15a85d69e2b23ce498fead47761624ae42c /run_tests.sh
parent72778951d6b8968f562fb8fefa02a57159ea1b83 (diff)
NSB update
Refactored main NSB VNF classes accroding to class diagram https://wiki.opnfv.org/display/yardstick/NSB+class+diagram All the SampleVNFs have been separated and placed under the SampleVNF class. Added AutoConnectSSH to automatically create SSH conneciton on demand. Added VnfdHelper class to wrap the VNFD dictionary in prepartion for class-based modeling. Extracted DpdkVnfSetupEnvHelper for DPDK based VNF setup. Extracted Stats and other client config to ResourceHelper Had to replace dict_key_flatten with deepgetitem due to Python 2.7 Jinja2 infinite recursion. Change-Id: Ia8840e9c44cdbdf39aab6b02e6d2176b31937dc9 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 50ccb04c6..b3cbfb127 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -16,6 +16,12 @@ getopts ":f" FILE_OPTION
# don't write .pyc files this can cause odd unittest results
export PYTHONDONTWRITEBYTECODE=1
+PY_VER="py$( python --version | sed 's/[^[:digit:]]//g' | cut -c-2 )"
+export PY_VER
+
+COVER_DIR_NAME="./tests/ci/"
+export COVER_DIR_NAME
+
run_flake8() {
echo "Running flake8 ... "
logfile=test_results.log
@@ -60,8 +66,11 @@ run_tests() {
}
run_coverage() {
- source tests/ci/cover.sh
- run_coverage_test
+ # don't re-run coverage on both py27 py3, it takes too long
+ if [[ -z $SKIP_COVERAGE ]] ; then
+ source $COVER_DIR_NAME/cover.sh
+ run_coverage_test
+ fi
}
run_functional_test() {