You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/07/23 17:13:50 UTC
[2/3] cassandra git commit: Skip testClearEphemeralSnapshots() on
Windows
Skip testClearEphemeralSnapshots() on Windows
Patch by jmckenzie; reviewed by tjake for CASSANDRA-9869
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16576390
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16576390
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16576390
Branch: refs/heads/trunk
Commit: 16576390351abe987c236825523608ce79e6e91a
Parents: 53b64a4
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Jul 23 11:12:28 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Jul 23 11:12:28 2015 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16576390/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index b5e62b3..5419ef5 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -50,6 +50,7 @@ import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.format.SSTableWriter;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
+import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -1530,6 +1531,11 @@ public class ColumnFamilyStoreTest
@Test
public void testClearEphemeralSnapshots() throws Throwable
{
+ // We don't do snapshot-based repair on Windows so we don't have ephemeral snapshots from repair that need clearing.
+ // This test will fail as we'll revert to the WindowsFailedSnapshotTracker and counts will be off, but since we
+ // don't do snapshot-based repair on Windows, we just skip this test.
+ Assume.assumeTrue(!FBUtilities.isWindows());
+
ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_INDEX1);
//cleanup any previous test gargbage