commit cff01c59fc816b43dc237abb3e44a8f7b8eb8c8f
author Karthick Narendran <karthick.narendran@gmail.com> Mon Jun 15 19:08:29 2020 +0100
committer GitHub <noreply@github.com> Mon Jun 15 19:08:29 2020 +0100
tree 398ca29210e97247920be0f1e377ef6dc61cf14c
parent 0e56e2ff3c769a0a5aa0afbb9cf136ca39573211

Allow testing ZK snapshot (#354)

Co-authored-by: Karthick Narendran <kanarend@microsoft.com>

lib/muchos/config/base.py

diff --git a/lib/muchos/config/base.py b/lib/muchos/config/base.py
index 6b24a25..7780d87 100644
--- a/lib/muchos/config/base.py
+++ b/lib/muchos/config/base.py
@@ -112,7 +112,8 @@
     ),
     "zookeeper_client_port": "2181",
     "zookeeper_basename": (
-        "{% if zookeeper_version is version('3.5', '>=') %}"
+        "{% if zookeeper_version is version('3.5', '>=') or "
+        "zookeeper_version in 'SNAPSHOT' %}"
         "apache-zookeeper-{{ zookeeper_version }}-bin{% else %}"
         "zookeeper-{{ zookeeper_version }}{% endif %}"
     ),
@@ -270,9 +271,9 @@
                 )
 
             # fail if we are using ZooKeeper >= 3.5.5 with Accumulo <= 1.9.x
-            if StrictVersion(self.version("zookeeper")) >= StrictVersion(
-                "3.5.5"
-            ) and StrictVersion(
+            if StrictVersion(
+                self.version("zookeeper").replace("-SNAPSHOT", "")
+            ) >= StrictVersion("3.5.5") and StrictVersion(
                 self.version("accumulo").replace("-SNAPSHOT", "")
             ) < StrictVersion(
                 "1.10.0"