From e6d471be8824aca4fcb7edf968f0ccc7f18e7e9c Mon Sep 17 00:00:00 2001 From: Doug Hellmann <doug@doughellmann.com> Date: Mon, 1 Jun 2015 13:35:11 +0000 Subject: [PATCH] Set up dependencies for cross-tests Set up the venv environment to let us use it for pre-release cross testing to ensure we don't break consuming project unit tests. Change-Id: If2bee203cb120b6c3b17a863fca2ece12651024f --- .gitignore | 3 +++ tox-tmpl.ini | 6 ++++-- tox.ini | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 82bf8ba..726575b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ WSME.egg-info/ AUTHORS ChangeLog pbr*.egg + +# Cross-test logs +cross-test-*.log diff --git a/tox-tmpl.ini b/tox-tmpl.ini index 0be172f..2940bde 100644 --- a/tox-tmpl.ini +++ b/tox-tmpl.ini @@ -126,5 +126,7 @@ commands = flake8 wsme wsmeext setup.py [testenv:venv] commands = {posargs} usedevelop=True -deps= - pbr +deps = + pbr + oslo.config + oslotest diff --git a/tox.ini b/tox.ini index 0af9a7d..412b65e 100644 --- a/tox.ini +++ b/tox.ini @@ -81,6 +81,8 @@ commands = {posargs} usedevelop = True deps = pbr + oslo.config + oslotest [testenv:py27-sa5-lxml-json] commands =