Repository: cassandra Updated Branches: refs/heads/trunk a59294bcf -> 67b7c3a39
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/67b7c3a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67b7c3a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67b7c3a3 Branch: refs/heads/trunk Commit: 67b7c3a394453303e7b4a95988c17a4a9fd0a723 Parents: a59294b Author: Tyler Hobbs <[email protected]> Authored: Wed Apr 15 17:47:10 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Apr 15 17:50:16 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/67b7c3a3/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 4b68dd6..8482287 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -66,6 +66,7 @@ import static org.junit.Assert.*; import static org.apache.cassandra.Util.cellname; import static org.apache.cassandra.Util.column; +import static org.junit.Assume.assumeTrue; @RunWith(OrderedJUnit4ClassRunner.class) public class ScrubTest @@ -124,6 +125,9 @@ public class ScrubTest @Test public void testScrubCorruptedCounterRow() throws IOException, WriteTimeoutException { + // 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);
