Handle difference in sstablemetadata output for pending repairs following CASSANDRA-11483
Patch by Joel Knighton; reviewed by Blake Eggleston for CASSANDRA-13755
diff --git a/repair_tests/incremental_repair_test.py b/repair_tests/incremental_repair_test.py
index a447d56..b081d44 100644
--- a/repair_tests/incremental_repair_test.py
+++ b/repair_tests/incremental_repair_test.py
@@ -34,7 +34,7 @@
def _get_repaired_data(cls, node, keyspace):
_sstable_name = compile('SSTable: (.+)')
_repaired_at = compile('Repaired at: (\d+)')
- _pending_repair = compile('Pending repair: (null|[a-f0-9\-]+)')
+ _pending_repair = compile('Pending repair: (\-\-|null|[a-f0-9\-]+)')
_sstable_data = namedtuple('_sstabledata', ('name', 'repaired', 'pending_id'))
out = node.run_sstablemetadata(keyspace=keyspace).stdout
@@ -45,7 +45,7 @@
repaired_times = [int(m.group(1)) for m in matches(_repaired_at)]
def uuid_or_none(s):
- return None if s == 'null' else UUID(s)
+ return None if s == 'null' or s == '--' else UUID(s)
pending_repairs = [uuid_or_none(m.group(1)) for m in matches(_pending_repair)]
assert names
assert repaired_times
