summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-25 20:01:49 +0000
committerGerrit Code Review <review@openstack.org>2019-03-25 20:01:49 +0000
commit840dba6eaf7790769e5d27f979b79f1af62d5421 (patch)
treeb5b5bb49b94b977a1da5665e8b03a4feb6cb36be /tests
parentc432fd508cad9c29d085a33dd7622b05aa94eb4a (diff)
parente8ebb9895ee7d46f9dc94ac45368ad4562cb8573 (diff)
downloadzuul-840dba6eaf7790769e5d27f979b79f1af62d5421.tar.gz
Merge "Increase zk session timeout during tests"
Diffstat (limited to 'tests')
-rw-r--r--tests/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/base.py b/tests/base.py
index ff0ab09fd..c6b8cf377 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -2552,7 +2552,7 @@ class ZuulTestCase(BaseTestCase):
self.merge_server = None
self.nodepool = zuul.nodepool.Nodepool(self.sched)
self.zk = zuul.zk.ZooKeeper()
- self.zk.connect(self.zk_config)
+ self.zk.connect(self.zk_config, timeout=30.0)
self.fake_nodepool = FakeNodepool(
self.zk_chroot_fixture.zookeeper_host,