cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aweisb...@apache.org
Subject [18/50] cassandra git commit: Handle difference in sstablemetadata output for pending repairs following CASSANDRA-11483
Date Wed, 15 Nov 2017 21:46:46 GMT
Handle difference in sstablemetadata output for pending repairs following CASSANDRA-11483

Patch by Joel Knighton; reviewed by Blake Eggleston for CASSANDRA-13755


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/013efa11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/013efa11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/013efa11

Branch: refs/heads/master
Commit: 013efa11f3d7bd2e3f64a4a5a865ff5dad565552
Parents: 61cbd5c
Author: Joel Knighton <jkni@apache.org>
Authored: Wed Aug 9 13:03:21 2017 -0500
Committer: Blake Eggleston <bdeggleston@gmail.com>
Committed: Thu Aug 10 15:34:00 2017 -0700

----------------------------------------------------------------------
 repair_tests/incremental_repair_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/013efa11/repair_tests/incremental_repair_test.py
----------------------------------------------------------------------
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 @@ class TestIncRepair(Tester):
     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 @@ class TestIncRepair(Tester):
         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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message