From 04150507cb6ebc7085d40e2f09c5006e685eedce Mon Sep 17 00:00:00 2001 From: helenyao Date: Mon, 5 Dec 2016 22:24:43 -0500 Subject: test-requirements.txt is added for unit test. JIRA: FUNCTEST-639 Some requirement packages are only needed by unit test and there is no need to include them in requirement.txt. This is the main reason to create a test-requirements.txt to hold all packages required by unit test. Change-Id: Iefa9f54b57666d30044ec174adfeb22d63b6b139 Signed-off-by: helenyao --- requirements.txt | 1 + run_unit_tests.sh | 4 +++- setup.py | 4 ---- test-requirements.txt | 23 +++++++++++++++++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 test-requirements.txt diff --git a/requirements.txt b/requirements.txt index 98745c3ae..e4d2877c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,3 +27,4 @@ subprocess32 shyaml dnspython Pillow==3.3.0 +click==6.6 \ No newline at end of file diff --git a/run_unit_tests.sh b/run_unit_tests.sh index 9f7bb5046..05b3c4ee2 100755 --- a/run_unit_tests.sh +++ b/run_unit_tests.sh @@ -43,7 +43,9 @@ source $WORKSPACE/functest_venv/bin/activate # install python packages easy_install -U setuptools easy_install -U pip -pip install -r $WORKSPACE/requirements.txt +pip install -r $WORKSPACE/test-requirements.txt + + pip install -e $WORKSPACE python $WORKSPACE/setup.py develop diff --git a/setup.py b/setup.py index 872b08913..58a9a4886 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,6 @@ setup( package_data={ }, url="https://www.opnfv.org", - install_requires=["coverage==4.1", - "mock==1.3.0", - "nose==1.3.7", - "click"], entry_points={ 'console_scripts': [ 'functest=functest.cli.cli_base:cli' diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 000000000..d65e12f6e --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,23 @@ +# +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# +coverage==4.1 +dnspython==1.15.0 +gitpython==1.0.1 +mock==1.3.0 +nose==1.3.7 +python-ceilometerclient==2.6.2 +python-congressclient==1.5.0 +python-keystoneclient==3.5.0 +python-neutronclient==6.0.0 +python-openstackclient==2.3.0 +pyyaml==3.10 +requests==2.8.0 +robotframework==2.9.1 +robotframework-requests==0.3.8 +robotframework-sshlibrary==2.1.1 +virtualenv==1.11.4 \ No newline at end of file -- cgit 1.2.3-korg