summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-20 14:58:22 +0000
committerGerrit Code Review <review@openstack.org>2012-07-20 14:58:22 +0000
commita852c832e4576e69eb3b15a5989375c79a3aac46 (patch)
tree1764837b26aa7859f146fcbe66fc80d76833e301
parentd5f2152dcfc4039de8324bdf75f6a2cd844dbdd0 (diff)
parent96bfc33b393e1d7c4e6ea7dfc86b2b2246c6c97f (diff)
Merge "Add test-options from Nova /w pyzmq"
-rw-r--r--tools/test-options1
-rw-r--r--tox.ini6
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/test-options b/tools/test-options
new file mode 100644
index 0000000..0179a55
--- /dev/null
+++ b/tools/test-options
@@ -0,0 +1 @@
+pyzmq>=2.1.11
diff --git a/tox.ini b/tox.ini
index 8753533..f18e7c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,3 +23,9 @@ setenv = NOSE_WITH_COVERAGE=1
[testenv:venv]
commands = {posargs}
+
+[testenv:full]
+sitepackages = True
+deps = -r{toxinidir}/tools/pip-requires
+ -r{toxinidir}/tools/test-requires
+ -r{toxinidir}/tools/test-options