From: Ross Brattain <ross.b.brattain@intel.com>
Date: Tue, 7 Feb 2017 10:17:43 +0000 (-0800)
Subject: remove trex install from run_tests.sh.
X-Git-Tag: danube.1.0~86^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F28271%2F2;p=yardstick.git

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 <module>
    from . import (constants, error, message, context,
ImportError: cannot import name 'constants'

Change-Id: I2ed06c0f88061baeff9ec96534cc59cca81924cc
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
---

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