Merge "fix package path and move files under doctor_tests"

[doctor.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 2f74083..748241e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,15 @@
 [tox]
 minversion = 2.3.1
-envlist = verify
+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
@@ -20,7 +23,8 @@ passenv =
     PROFILER_TYPE
     PYTHON_ENABLE
     CI_DEBUG
-
-[testenv:verify]
-changedir = {toxinidir}/tests
-commands = python main.py
+    INSTALLER_TYPE
+    INSTALLER_IP
+    PROFILER_TYPE
+changedir = {toxinidir}/doctor_tests
+commands = doctor-test