diff options
| author | Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com> | 2015-03-31 07:25:28 +0000 |
|---|---|---|
| committer | Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com> | 2015-04-01 09:02:13 +0000 |
| commit | f518cfe252721553cca1d31c0980dc7aa4111a64 (patch) | |
| tree | 3db4f24e54780ce9196de4b359fc54ec404b75b8 | |
| parent | a1f74de00955dbcbdb8fcd085bac89926d358b60 (diff) | |
| download | heat-f518cfe252721553cca1d31c0980dc7aa4111a64.tar.gz | |
Add separate requirements.txt to integration tests
and use it during tox run. This should speed up the tox venv creation
somewhat, as the new requirements is shorter, thus less packages are
installed or C extensions compiled.
Also this is the first step to ease packaging of the integration tests
as a separate tool.
Change-Id: I914eb675e7f025e03a22719d5dff8ed741fbd37d
| -rw-r--r-- | .testr.conf | 5 | ||||
| -rw-r--r-- | heat_integrationtests/requirements.txt | 18 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 25 insertions, 2 deletions
diff --git a/.testr.conf b/.testr.conf index 1bdd94e50..044f5a32a 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,7 +1,8 @@ [DEFAULT] test_command= PYTHON=$(echo ${PYTHON:-python} | sed 's/--source heat//g') - ${PYTHON} -m subunit.run discover -s . $LISTOPT $IDOPTION - for plugin in contrib/*; do ${PYTHON} -m subunit.run discover -s $plugin $LISTOPT $IDOPTION; done + START_AT=${TESTR_START_DIR:-.} + ${PYTHON} -m subunit.run discover -s $START_AT -t . $LISTOPT $IDOPTION + if [ "$START_AT" = "." ]; then for plugin in $START_AT/contrib/*; do ${PYTHON} -m subunit.run discover -s $plugin $LISTOPT $IDOPTION; done; fi test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/heat_integrationtests/requirements.txt b/heat_integrationtests/requirements.txt new file mode 100644 index 000000000..2f08f9a19 --- /dev/null +++ b/heat_integrationtests/requirements.txt @@ -0,0 +1,18 @@ +kombu>=2.5.0 +oslo.log>=1.0.0,<1.1.0 # Apache-2.0 +oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 +oslo.config>=1.9.3,<1.10.0 # Apache-2.0 +oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 +paramiko>=1.13.0 +python-cinderclient>=1.1.0 +python-keystoneclient>=1.1.0 +python-heatclient>=0.3.0 +python-neutronclient>=2.3.11,<3 +python-novaclient>=2.22.0 +python-swiftclient>=2.2.0 +PyYAML>=3.1.0 +requests>=2.2.0,!=2.4.0 +six>=1.9.0 +testrepository>=0.0.18 +testscenarios>=0.4 +testtools>=0.9.36,!=1.2.0 @@ -26,6 +26,10 @@ commands = bash tools/pretty_tox.sh '{posargs}' [testenv:integration] +setenv = VIRTUAL_ENV={envdir} + TESTR_START_DIR=heat_integrationtests +usedevelop = False +deps = -r{toxinidir}/heat_integrationtests/requirements.txt commands = bash tools/pretty_tox.sh '--concurrency=1 ^heat_integrationtests.*{posargs}' |