diff options
author | Jose Lausuch <jose.lausuch@ericsson.com> | 2017-05-18 12:28:43 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-05-18 12:28:43 +0000 |
commit | 59d4e9757e52f452a67bbce48c2ebafc431f4cb1 (patch) | |
tree | 9c40193fcc9ead67fbdaf9ff623da2bef5e2860a | |
parent | 8e6892b8fd6a2e28915c903baf1544c455dc881a (diff) | |
parent | 901da0cc00f4817fb9362f587500a93c30c44e0a (diff) |
Merge "Clean test-requirements.txt"
-rw-r--r-- | requirements.txt | 2 | ||||
-rwxr-xr-x | run_unit_tests.sh | 5 | ||||
-rw-r--r-- | test-requirements.txt | 21 |
3 files changed, 5 insertions, 23 deletions
diff --git a/requirements.txt b/requirements.txt index 4170157c1..65b369799 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 9780de7ac..86096fabf 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 4ba763a5f..b0d4ff8d1 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 |