Use a CustomCcmRule in HeapCompressionIT

We have a check that CcmRule is used only in parallelizable test (actually it would work in isolated tests as well, but it's just as easy to change this test).
apache · Jun 1, 2018 · a0a0ff9 · a0a0ff9
1 parent 53f5cc7
commit a0a0ff9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...n-tests/src/test/java/com/datastax/oss/driver/api/core/compression/HeapCompressionIT.java b/...n-tests/src/test/java/com/datastax/oss/driver/api/core/compression/HeapCompressionIT.java
@@ -22,7 +22,7 @@
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
-import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
+import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.categories.IsolatedTests;
@@ -39,7 +39,7 @@ public class HeapCompressionIT {
     System.setProperty("io.netty.noUnsafe", "true");
   }
 
-  @ClassRule public static CcmRule ccmRule = CcmRule.getInstance();
+  @ClassRule public static CustomCcmRule ccmRule = CustomCcmRule.builder().build();
 
   @ClassRule
   public static SessionRule<CqlSession> schemaSessionRule =

diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/session/SessionRule.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/session/SessionRule.java
@@ -16,6 +16,7 @@
 package com.datastax.oss.driver.api.testinfra.session;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.NoNodeAvailableException;
 import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
@@ -116,7 +117,13 @@ protected void before() {
   @Override
   protected void after() {
     if (keyspace != null) {
-      SessionUtils.dropKeyspace(session, keyspace, slowProfile);
+      try {
+        SessionUtils.dropKeyspace(session, keyspace, slowProfile);
+      } catch (NoNodeAvailableException e) {
+        // Rule ordering is not deterministic, so the cassandraResource might have shut down
+        // already. Dropping the keyspace is not critical since we're throwing the cluster away, so
+        // just ignore.
+      }
     }
     session.close();
   }