From 35c03f69182e2b6e663c0fb2c2dc96a11bd296f2 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Tue, 7 Feb 2017 02:17:43 -0800 Subject: remove trex install from run_tests.sh. We have mocked out all the Trex imports, so we don't need to download the Trex library It doesn't really make sense to down external libraries each time we run unittests. Trex is a large stand-alone package and shouldn't really be used during unittests Importing Trex caused some odd pyzmq import errors on Python 3 File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master /trex/scripts/external_libs/pyzmq-14.5.0/python3/fedora18 /64bit/zmq/backend/cython/__init__.py", line 6, in from . import (constants, error, message, context, ImportError: cannot import name 'constants' Change-Id: I2ed06c0f88061baeff9ec96534cc59cca81924cc Signed-off-by: Ross Brattain --- run_tests.sh | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'run_tests.sh') diff --git a/run_tests.sh b/run_tests.sh index 1f985b6c1..2519d94f6 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -33,32 +33,9 @@ run_flake8() { fi } -get_external_libs() { - cd $(dirname ${BASH_SOURCE[0]}) - TREX_DOWNLOAD="https://trex-tgn.cisco.com/trex/release/v2.05.tar.gz" - TREX_DIR=$PWD/trex/scripts - if [ ! -d "$TREX_DIR" ]; then - rm -rf ${TREX_DOWNLOAD##*/} - if [ ! -e ${TREX_DOWNLOAD##*/} ] ; then - wget -nv $TREX_DOWNLOAD - fi - tar xf ${TREX_DOWNLOAD##*/} - pushd . - rm -rf trex && mkdir -p trex - mv v2.05 trex/scripts - rm -rf v2.05.tar.gz - touch "$PWD/trex/scripts/automation/trex_control_plane/stl/__init__.py" - popd - fi - echo "Done." - export PYTHONPATH=$PYTHONPATH:"$PWD/trex/scripts/automation/trex_control_plane" - export PYTHONPATH=$PYTHONPATH:"$PWD/trex/scripts/automation/trex_control_plane/stl" - echo $PYTHONPATH -} run_tests() { echo "Get external libs needed for unit test" - get_external_libs echo "Running unittest ... " if [ $FILE_OPTION == "f" ]; then -- cgit 1.2.3-korg