cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/2] cassandra git commit: Skip scrub counter test when compression is enabled
Date Wed, 15 Apr 2015 22:48:27 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 dac54976a -> 19eb5e2ed


Skip scrub counter test when compression is enabled

Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-9135


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

Branch: refs/heads/cassandra-2.1
Commit: 9bbcbf5052286b84e2a6acaf677c992f30bc1182
Parents: a64bc43
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Apr 15 17:47:10 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Apr 15 17:47:10 2015 -0500

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/ScrubTest.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bbcbf50/test/unit/org/apache/cassandra/db/ScrubTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index 23e9381..632ce1c 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -53,6 +53,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
 import static org.apache.cassandra.Util.column;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 @RunWith(OrderedJUnit4ClassRunner.class)
 public class ScrubTest extends SchemaLoader
@@ -87,6 +88,9 @@ public class ScrubTest extends SchemaLoader
     @Test
     public void testScrubCorruptedCounterRow() throws IOException, InterruptedException,
ExecutionException
     {
+        // skip the test when compression is enabled until CASSANDRA-9140 is complete
+        assumeTrue(!Boolean.parseBoolean(System.getProperty("cassandra.test.compression",
"false")));
+
         CompactionManager.instance.disableAutoCompaction();
         Keyspace keyspace = Keyspace.open(KEYSPACE);
         ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(COUNTER_CF);


Mime
View raw message