Skip to content

Commit 91b91d8

Browse files
committed
PYTHON-1017: fix test failure
1 parent 9c1050f commit 91b91d8

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
3.15.2
2+
======
3+
4+
Other
5+
-----
6+
* Fix tests when RF is not maintained if we decomission a node (PYTHON-1017)
7+
18
3.15.1
29
======
310
September 6, 2018

tests/integration/long/utils.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
import time
1818

1919
from collections import defaultdict
20-
from ccmlib.node import Node
20+
from ccmlib.node import Node, ToolError
2121

22+
from nose.tools import assert_in
2223
from cassandra.query import named_tuple_factory
2324
from cassandra.cluster import ConsistencyLevel
2425

@@ -101,7 +102,17 @@ def force_stop(node):
101102

102103

103104
def decommission(node):
104-
get_node(node).decommission()
105+
try:
106+
get_node(node).decommission()
107+
except ToolError as e:
108+
expected_errs = (('Not enough live nodes to maintain replication '
109+
'factor in keyspace system_distributed'),
110+
'Perform a forceful decommission to ignore.')
111+
for err in expected_errs:
112+
assert_in(err, e.stdout)
113+
# in this case, we're running against a C* version with CASSANDRA-12510
114+
# applied and need to decommission with `--force`
115+
get_node(node).decommission(force=True)
105116
get_node(node).stop()
106117

107118

0 commit comments

Comments
 (0)