You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/02/26 04:54:11 UTC
[1/3] git commit: Fix test failing for clearing commit log directory
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 <yu...@apache.org>
Authored: Tue Feb 25 21:52:16 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
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
[2/3] git commit: Fix test failing for clearing commit log directory
Posted by yu...@apache.org.
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/trunk
Commit: 5b6d2e40c85f6f9770c03a22e9b11ea5fb0fbe4c
Parents: d0c3859
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Feb 25 21:52:16 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
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
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1cb0dff7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cb0dff7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cb0dff7
Branch: refs/heads/trunk
Commit: 1cb0dff7a2d62b343e0b89e2ef16e1b0a4f84cb2
Parents: b1201ba 5b6d2e4
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Feb 25 21:53:53 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Feb 25 21:53:53 2014 -0600
----------------------------------------------------------------------
.../cassandra/dht/OrderPreservingPartitionerTest.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------