Fixing Misc Unreliable Tests

GregBestland · tolbertam · commit 3c7b209d2baf · 2017-03-13T14:31:17.000-05:00
Fixed race conditions in HostConnectionPool Related to changes introduced in JAVA-1371

Skipping null mapper tests for C* &lt; 2.1.0
diff --git a/driver-core/src/test/java/com/datastax/driver/core/HostConnectionPoolTest.java b/driver-core/src/test/java/com/datastax/driver/core/HostConnectionPoolTest.java
@@ -18,7 +18,7 @@
 import com.codahale.metrics.Gauge;
 import com.datastax.driver.core.exceptions.*;
 import com.datastax.driver.core.policies.ConstantReconnectionPolicy;
-import com.datastax.driver.core.utils.MoreFutures;
+import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.*;
@@ -290,7 +290,7 @@ public void should_adjust_connection_keyspace_on_dequeue_if_pool_state_is_differ
             int count = 0;
             for (MockRequest queuedRequest : queuedRequests) {
                 try {
-                    Uninterruptibles.getUninterruptibly(queuedRequest.connectionFuture, 5, TimeUnit.SECONDS);
+                    Uninterruptibles.getUninterruptibly(queuedRequest.connectionFuture, 10, TimeUnit.SECONDS);
                     count++;
                 } catch (ExecutionException e) {
                     // 128th request should timeout since all in flight requests are used.
@@ -400,7 +400,6 @@ public void should_fail_in_dequeue_when_setting_keyspace_and_another_set_keyspac
                 assertThat(e.getCause()).isInstanceOf(DriverException.class);
                 assertThat(e.getCause().getMessage()).contains("Aborting attempt to set keyspace to 'newkeyspace' since there is already an in flight attempt to set keyspace to 'slowks'.");
             }
-
         } finally {
             MockRequest.completeAll(requests);
             cluster.close();
@@ -1242,8 +1241,8 @@ public void should_wait_on_connection_if_zero_core_connections() throws Exceptio
 
             // Should create up to core connections.
             verify(factory, timeout(readTimeout).times(1)).open(any(HostConnectionPool.class));
-
             assertPoolSize(pool, 1);
+            Uninterruptibles.getUninterruptibly(request.requestInitialized, 10, TimeUnit.SECONDS);
             request.simulateSuccessResponse();
         } finally {
             cluster.close();
@@ -1348,6 +1347,9 @@ static class MockRequest implements Connection.ResponseCallback {
         enum State {START, COMPLETED, FAILED, TIMED_OUT}
 
         final ListenableFuture<Connection> connectionFuture;
+
+        final ListenableFuture<Connection.ResponseHandler> requestInitialized;
+
         private volatile Connection.ResponseHandler responseHandler;
 
         final AtomicReference<State> state = new AtomicReference<State>(State.START);
@@ -1404,12 +1406,13 @@ private static void completeAll(List<MockRequest> requests) {
 
         private MockRequest(HostConnectionPool pool, int timeoutMillis, int maxQueueSize) throws ConnectionException {
             this.connectionFuture = pool.borrowConnection(timeoutMillis, MILLISECONDS, maxQueueSize);
-            Futures.addCallback(this.connectionFuture, new MoreFutures.SuccessCallback<Connection>() {
+            requestInitialized = Futures.transform(this.connectionFuture, new Function<Connection, Connection.ResponseHandler>() {
                 @Override
-                public void onSuccess(Connection connection) {
+                public Connection.ResponseHandler apply(Connection connection) {
                     MockRequest thisRequest = MockRequest.this;
                     thisRequest.responseHandler = new Connection.ResponseHandler(connection, -1, thisRequest);
                     connection.dispatcher.add(thisRequest.responseHandler);
+                    return responseHandler;
                 }
             });
         }
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperSaveNullFieldsTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperSaveNullFieldsTest.java
@@ -17,6 +17,7 @@
 
 import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.CCMTestsSupport;
+import com.datastax.driver.core.utils.CassandraVersion;
 import com.datastax.driver.mapping.Mapper.Option;
 import com.datastax.driver.mapping.annotations.PartitionKey;
 import com.datastax.driver.mapping.annotations.Table;
@@ -40,6 +41,7 @@ public void setup() {
         mapper = new MappingManager(session()).mapper(User.class);
     }
 
+    @CassandraVersion("2.1.0")
     @Test(groups = "short")
     void should_save_null_fields_if_requested() {
         should_save_null_fields(true, Option.saveNullFields(true));
