cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [2/6] cassandra git commit: fixup SSTableRewriterTest
Date Mon, 06 Jul 2015 11:50:23 GMT
fixup SSTableRewriterTest


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

Branch: refs/heads/cassandra-2.2
Commit: aa8a7b5576417c0469417eace131f270afc29923
Parents: ec320e8
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Mon Jul 6 12:49:48 2015 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Mon Jul 6 12:49:48 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/io/sstable/SSTableRewriterTest.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa8a7b55/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 5ebfef7..a735657 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -647,8 +647,13 @@ public class SSTableRewriterTest extends SchemaLoader
         {
             assertEquals(1, cfs.getSSTables().size());
             validateCFS(cfs);
+            truncate(cfs);
+        }
+        else
+        {
+            assertEquals(0, cfs.getSSTables().size());
+            cfs.truncateBlocking();
         }
-        truncate(cfs);
         filecount = assertFileCounts(s.descriptor.directory.list(), 0, 0);
         if (offline)
         {


Mime
View raw message