From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 17 May 2017 15:41:15 +0000 (+0200)
Subject: Clean test-requirements.txt
X-Git-Tag: 0.2~643^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=901da0cc00f4817fb9362f587500a93c30c44e0a;p=functest-xtesting.git

Clean test-requirements.txt

Now only the mandatory requirements related to unit testing are listed
in test-requirements.txt.

Change-Id: I2f17a9e18e90d779ddc80b1ace9ac770a76c3385
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/requirements.txt b/requirements.txt
index 4170157c..65b36979 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ python-keystoneclient==3.5.0
 python-neutronclient==6.0.0
 python-novaclient==6.0.0
 python-congressclient==1.5.0
-virtualenv==15.1.0
+python-tackerclient==0.7.0
 pexpect==4.0
 requests>=2.8.0
 robotframework==3.0.2
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index 9780de7a..86096fab 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -14,13 +14,16 @@ fi
 # ***************
 echo "Running unit tests..."
 
+sudo apt-get install -y build-essential python-dev python-pip
+sudo pip install virtualenv==15.1.0
+
 # start vitual env
 virtualenv $WORKSPACE/functest_venv
 source $WORKSPACE/functest_venv/bin/activate
 
 # install python packages
-sudo apt-get install -y build-essential python-dev python-pip
 pip install --upgrade pip
+pip install -r $WORKSPACE/requirements.txt
 pip install -r $WORKSPACE/test-requirements.txt
 pip install $WORKSPACE
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 4ba763a5..b0d4ff8d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,27 +5,6 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-click==6.6
 coverage==4.1
-dnspython==1.15.0
-gitpython==1.0.1
-iniparse==0.4
 mock==1.3.0
 nose==1.3.7
-python-ceilometerclient==2.6.2
-python-congressclient==1.5.0
-python-heatclient==1.7.0
-python-keystoneclient==3.5.0
-python-neutronclient==6.0.0
-python-openstackclient==2.3.0
-python-tackerclient==0.7.0
-pyyaml==3.10
-requests==2.8.0
-robotframework==3.0.2
-robotframework-httplibrary==0.4.2
-robotframework-requests==0.4.7
-robotframework-sshlibrary==2.1.3
-subprocess32==3.2.7
-virtualenv==15.1.0
-PrettyTable>=0.7.1,<0.8 # BSD
-six>=1.9.0 # MIT