summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-26 12:43:00 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-28 11:34:23 +0200
commit9ee9b136ebec5d21f5165acc5e4441c3e91a56dd (patch)
tree4495625f916c4004b9d36a5d57ee3b34c2538e0b /tox.ini
parent3e0300e8f9695348aa4564f87a23ac3c0cf737ff (diff)
Add doctor-test package
It also updates test-requirements.txt to conform with OpenStack stable/ocata and renames it requirements.txt. tests.main:main is considered as entry point and run.sh as script. run.sh could be renamed to avoid possible conflicts in functest. tox.ini is updated to pin the right versions and build files are filtered. The next dependencies can be safely removed: - paramiko - scp - python-openstackclient - python-ceilometerclient - virtualenv Change-Id: I2091cfe4751640bf83d77e1fdd713af1e31fa89d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini10
1 files changed, 6 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index e75a374..c6262ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,12 @@ envlist = py34
skipsdist = True
[testenv]
-install_command = pip install -U {opts} {packages}
+usedevelop = True
+install_command = pip install \
+ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \
+ {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
passenv =
OS_AUTH_URL
OS_USERNAME
@@ -21,5 +24,4 @@ passenv =
PYTHON_ENABLE
CI_DEBUG
changedir = {toxinidir}/tests
-commands = python main.py
-
+commands = doctor-test