summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-22 08:46:43 +0000
committerGerrit Code Review <review@openstack.org>2013-01-22 08:46:43 +0000
commitcf7f75d66ca8e20e1058758ce5f0fb9859f413de (patch)
tree607ce6ba8f633d2f227347bfb4890732ebee5a0f /tools
parent00ad52ee11a3add8d7d3c47bf6e97944f297513c (diff)
parent2f8d97b934520fc2bf2a21696cd6cb193ccc91ee (diff)
downloadoslo-cf7f75d66ca8e20e1058758ce5f0fb9859f413de.tar.gz
oslo-cf7f75d66ca8e20e1058758ce5f0fb9859f413de.tar.xz
oslo-cf7f75d66ca8e20e1058758ce5f0fb9859f413de.zip
Merge "Enable ZeroMQ tests"
Diffstat (limited to 'tools')
-rw-r--r--tools/test-options1
-rw-r--r--tools/test-requires1
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/test-options b/tools/test-options
deleted file mode 100644
index 0179a55..0000000
--- a/tools/test-options
+++ /dev/null
@@ -1 +0,0 @@
-pyzmq>=2.1.11
diff --git a/tools/test-requires b/tools/test-requires
index 986567c..2e349e1 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -11,6 +11,7 @@ openstack.nose_plugin
nosehtmloutput
pep8==1.3.3
pylint
+pyzmq>=2.1.11
setuptools-git>=0.4
sphinx
webtest