PYTHON-1017: fix test failure

mambocab · mambocab · commit 91b91d8d05c9 · 2018-09-21T09:25:43.000-04:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,10 @@
+3.15.2
+======
+
+Other
+-----
+* Fix tests when RF is not maintained if we decomission a node (PYTHON-1017)
+
 3.15.1
 ======
 September 6, 2018
diff --git a/tests/integration/long/utils.py b/tests/integration/long/utils.py
@@ -17,8 +17,9 @@
 import time
 
 from collections import defaultdict
-from ccmlib.node import Node
+from ccmlib.node import Node, ToolError
 
+from nose.tools import assert_in
 from cassandra.query import named_tuple_factory
 from cassandra.cluster import ConsistencyLevel
 
@@ -101,7 +102,17 @@ def force_stop(node):
 
 
 def decommission(node):
-    get_node(node).decommission()
+    try:
+        get_node(node).decommission()
+    except ToolError as e:
+        expected_errs = (('Not enough live nodes to maintain replication '
+                          'factor in keyspace system_distributed'),
+                         'Perform a forceful decommission to ignore.')
+        for err in expected_errs:
+            assert_in(err, e.stdout)
+        # in this case, we're running against a C* version with CASSANDRA-12510
+        # applied and need to decommission with `--force`
+        get_node(node).decommission(force=True)
     get_node(node).stop()
 
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,10 @@ @@
 +3.15.2
 +======
++
 +Other
 +-----
 +* Fix tests when RF is not maintained if we decomission a node (PYTHON-1017)
++
 .15.1
 ======
 September 6, 2018