Repository: cassandra Updated Branches: refs/heads/trunk 68722e7e5 -> c5bc81148
Fix failing CQLSSTableWriterLongTest patch by Ariel Weisberg; reviewed by Carl Yeksigian for CASSANDRA-9287 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5f59123 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5f59123 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5f59123 Branch: refs/heads/trunk Commit: f5f59123769a0aa71d07b22518367d35c481d711 Parents: bccd4a3 Author: Ariel Weisberg <[email protected]> Authored: Fri May 1 15:26:46 2015 -0400 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu May 14 17:44:15 2015 +0300 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5f59123/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java b/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java index 77d319d..fcec40d 100644 --- a/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java +++ b/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java @@ -24,12 +24,13 @@ import java.util.List; import java.util.Random; import com.google.common.io.Files; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.service.StorageService; @@ -38,6 +39,8 @@ public class CQLSSTableWriterLongTest @BeforeClass public static void setup() throws Exception { + SchemaLoader.cleanupAndLeaveDirs(); + Keyspace.setInitialized(); StorageService.instance.initServer(); }
