Repository: cassandra Updated Branches: refs/heads/trunk 270a05d63 -> 30a5597ca
Try to fix flapping SSTableRewriterTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/064144bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/064144bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/064144bd Branch: refs/heads/trunk Commit: 064144bd403e0327bf8e340ba54e857513078869 Parents: 25d4a13 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Jan 14 18:08:02 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Jan 14 18:08:27 2015 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/064144bd/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java index 88bb8dc..fbd627b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java @@ -174,6 +174,7 @@ public class SSTableRewriterTest extends SchemaLoader int filecounts = assertFileCounts(sstables.iterator().next().descriptor.directory.list(), 0, 0); assertEquals(1, filecounts); cfs.truncateBlocking(); + Thread.sleep(1000); // make sure the deletion tasks have run etc validateCFS(cfs); } @@ -467,6 +468,7 @@ public class SSTableRewriterTest extends SchemaLoader Thread.sleep(1000); assertFileCounts(s.descriptor.directory.list(), 0, 0); cfs.truncateBlocking(); + Thread.sleep(1000); // make sure the deletion tasks have run etc validateCFS(cfs); }