Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d0c38591b -> 5b6d2e40c refs/heads/trunk b1201ba4e -> 1cb0dff7a
Fix test failing for clearing commit log directory Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b6d2e40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b6d2e40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b6d2e40 Branch: refs/heads/cassandra-2.1 Commit: 5b6d2e40c85f6f9770c03a22e9b11ea5fb0fbe4c Parents: d0c3859 Author: Yuki Morishita <[email protected]> Authored: Tue Feb 25 21:52:16 2014 -0600 Committer: Yuki Morishita <[email protected]> Committed: Tue Feb 25 21:52:16 2014 -0600 ---------------------------------------------------------------------- .../cassandra/dht/OrderPreservingPartitionerTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b6d2e40/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java b/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java index 80021fd..e14dec8 100644 --- a/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java +++ b/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java @@ -18,17 +18,24 @@ */ package org.apache.cassandra.dht; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; public class OrderPreservingPartitionerTest extends PartitionerTestCase<StringToken> { + @BeforeClass + public static void cleanStatesFromPreviousTest() + { + // Since OrderPreservingPartitioner#describeOwnership tries to read SSTables, + // we need to clear data dir to clear garbage from previous test before running tests. + SchemaLoader.cleanupAndLeaveDirs(); + } + public void initPartitioner() { partitioner = new OrderPreservingPartitioner(); - // need to clear data dir - SchemaLoader.cleanupAndLeaveDirs(); } @Test
