Repository: cassandra
Updated Branches:
  refs/heads/trunk a22dd291b -> 14372cd4e


ninja fix test


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12ac7eaf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12ac7eaf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12ac7eaf

Branch: refs/heads/trunk
Commit: 12ac7eaf6f26ae8001954841c9b2120d02cbdcdd
Parents: 42b91d4
Author: Jake Luciani <j...@apache.org>
Authored: Wed Sep 10 17:14:57 2014 -0400
Committer: Jake Luciani <j...@apache.org>
Committed: Wed Sep 10 17:14:57 2014 -0400

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/cql3/CqlMetricsTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12ac7eaf/test/unit/org/apache/cassandra/cql3/CqlMetricsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CqlMetricsTest.java 
b/test/unit/org/apache/cassandra/cql3/CqlMetricsTest.java
index dc9c6a4..5dea2fb 100644
--- a/test/unit/org/apache/cassandra/cql3/CqlMetricsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CqlMetricsTest.java
@@ -21,7 +21,9 @@ import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
 import org.apache.cassandra.OrderedJUnit4ClassRunner;
+import org.apache.cassandra.SchemaLoader;
 import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.service.EmbeddedCassandraService;
 import org.junit.BeforeClass;
@@ -32,7 +34,7 @@ import java.io.IOException;
 
 
 @RunWith(OrderedJUnit4ClassRunner.class)
-public class CqlMetricsTest
+public class CqlMetricsTest extends SchemaLoader
 {
 
     private static EmbeddedCassandraService cassandra;
@@ -44,6 +46,8 @@ public class CqlMetricsTest
     @BeforeClass()
     public static void setup() throws ConfigurationException, IOException
     {
+        Schema.instance.clear();
+
         cassandra = new EmbeddedCassandraService();
         cassandra.start();
 

Reply via email to