Merge "Add doctor-test package"

[doctor.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index c859582..c8cebe8 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,30 @@
 [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
-
-[testenv:verify]
+deps = -r{toxinidir}/requirements.txt
+passenv =
+    OS_AUTH_URL
+    OS_USERNAME
+    OS_PASSWORD
+    OS_USER_DOMAIN_NAME
+    OS_PROJECT_NAME
+    OS_TENANT_NAME
+    OS_PROJECT_DOMAIN_NAME
+    IMAGE_NAME
+    VM_COUNT
+    PROFILER_TYPE
+    PYTHON_ENABLE
+    CI_DEBUG
+    INSTALLER_TYPE
+    INSTALLER_IP
+    PROFILER_TYPE
 changedir = {toxinidir}/tests
-commands = python main.py
+commands = doctor-test