summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-27 13:39:36 +0000
committerGerrit Code Review <review@openstack.org>2015-07-27 13:39:36 +0000
commit595cf53cb166367c1e8aa238bcb46634d3b5907a (patch)
treefeb9a6dbd14a6fb7a08c29673f9b84337c84fd6a
parenta0eafcb093933ef409adb7a9192c3e0fc1e6a481 (diff)
parent3e959ca55dda5dbd9d1255c407960819d3861efc (diff)
downloadpython-designateclient-595cf53cb166367c1e8aa238bcb46634d3b5907a.tar.gz
Merge "Updated from global requirements"
-rw-r--r--test-requirements.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 1055742..e850424 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,7 @@
# Hacking already pins down pep8, pyflakes and flake8
hacking<0.10,>=0.9.2
coverage>=3.6
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
discover
oslotest>=1.7.0 # Apache-2.0
python-subunit>=0.0.18