summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-30 16:11:03 +0000
committerGerrit Code Review <review@openstack.org>2016-09-30 16:11:03 +0000
commitffb032de29ea79a04cd8791da1ce9466bfb77018 (patch)
treea8865a271195e66af3ae2b56915ced26f6742d9d
parent625a54de574d3f100e88f9dfb6bcd595150e4357 (diff)
parent4f177580fe6bb632b924ad2f13a2e98a8bd7bdb6 (diff)
downloadtooz-ffb032de29ea79a04cd8791da1ce9466bfb77018.tar.gz
Merge "etcd: run tests in clustering mode too"
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg
index b87bd9c..f953f5d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,7 +63,7 @@ test =
testtools>=1.4.0 # MIT
coverage>=3.6 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
- pifpaf>=0.4.0 # Apache-2.0
+ pifpaf>=0.10.0 # Apache-2.0
doc =
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d5261fb..806e5b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,9 +63,11 @@ commands = pifpaf -e TOOZ_TEST run mysql -- python setup.py testr --slowest --te
[testenv:py27-etcd]
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python setup.py testr --slowest --testr-args="{posargs}"
+ {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd --cluster -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py35-etcd]
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python setup.py testr --slowest --testr-args="{posargs}"
+ {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd --cluster -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-consul]
commands = {toxinidir}/setup-consul-env.sh pifpaf -g TOOZ_TEST run consul -- python setup.py testr --slowest --testr-args="{posargs}"