Repository: cassandra Updated Branches: refs/heads/cassandra-3.1 798a7a8fe -> 51a871133
Don't clean test folder twice in unit tests patch by Stefania; reviewed by slebresne for CASSANDRA-10682 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a786081 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a786081 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a786081 Branch: refs/heads/cassandra-3.1 Commit: 9a78608193f766af76cacfafc4f9a6635b1db4ee Parents: eb8afb7 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Nov 13 13:22:13 2015 +0800 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 17 11:51:13 2015 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/SchemaLoader.java | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a786081/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index f2c01e4..5d720c4 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -63,7 +63,7 @@ public class SchemaLoader public static void prepareServer() { - CQLTester.prepareServer(false); + CQLTester.prepareServer(); } public static void startGossiper() http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a786081/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java index e92563b..fd0b086 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@ -109,7 +109,7 @@ public abstract class CQLTester PROTOCOL_VERSIONS = builder.build(); // Once per-JVM is enough - prepareServer(true); + prepareServer(); nativeAddr = InetAddress.getLoopbackAddress(); @@ -138,9 +138,9 @@ public abstract class CQLTester // is not expected to be the same without preparation) private boolean usePrepared = USE_PREPARED_VALUES; - public static void prepareServer(boolean checkInit) + public static void prepareServer() { - if (checkInit && isServerPrepared) + if (isServerPrepared) return; // Cleanup first