Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19eb5e2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19eb5e2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19eb5e2e Branch: refs/heads/trunk Commit: 19eb5e2edfc1501a848b173be7340834ad8f9d46 Parents: dac5497 9bbcbf5 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Apr 15 17:48:13 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Apr 15 17:48:13 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/19eb5e2e/test/unit/org/apache/cassandra/db/ScrubTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/ScrubTest.java index 571fe0e,632ce1c..383b1d0 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@@ -88,8 -86,11 +89,11 @@@ public class ScrubTest extends SchemaLo } @Test - public void testScrubCorruptedCounterRow() throws IOException, InterruptedException, ExecutionException + 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);
