commit a4bdd6df2eac1f2310c68b542131b200c2490e28
author Andrew Tolbert <andrew.tolbert@datastax.com> Wed Jun 29 16:34:30 2016 -0500
committer olim7t <omichallat+github@gmail.com> Wed Jul 13 13:12:30 2016 -0700
tree e7bbd55b61afb629fe7ab16f1cfea41c7ae41a73
parent 00652e5f1659f4a5497aecf024c66ece20300614

Set idempotence on Statement instead of globally

Makes test more reliable as its possible any ongoing queries could be
executed and increment the speculative execution counter.

Also reattempt test if scheduled execution did not occur.  It is
possible, yet unlikely, that a scheduled execution may not fire if the
timeout is not invoked before the response is received.   This should be
incredibly rare.

driver-core/src/test/java/com/datastax/driver/core/SpeculativeExecutionIntegrationTest.java

diff --git a/driver-core/src/test/java/com/datastax/driver/core/SpeculativeExecutionIntegrationTest.java b/driver-core/src/test/java/com/datastax/driver/core/SpeculativeExecutionIntegrationTest.java
index cbbbb7f..ddb65f4 100644
--- a/driver-core/src/test/java/com/datastax/driver/core/SpeculativeExecutionIntegrationTest.java
+++ b/driver-core/src/test/java/com/datastax/driver/core/SpeculativeExecutionIntegrationTest.java
@@ -20,7 +20,7 @@
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.times;
 
 /**
@@ -41,8 +41,7 @@
         timestampGenerator = Mockito.spy(ServerSideTimestampGenerator.INSTANCE);
         return Cluster.builder()
                 .withTimestampGenerator(timestampGenerator)
-                .withQueryOptions(new QueryOptions().setDefaultIdempotence(true))
-                        // Set an artificially low timeout to force speculative execution
+                // Set an artificially low timeout to force speculative execution
                 .withSpeculativeExecutionPolicy(new ConstantSpeculativeExecutionPolicy(1, 2));
     }
 
@@ -58,16 +57,30 @@
     public void should_use_same_default_timestamp_for_all_executions() {
         Metrics.Errors errors = cluster().getMetrics().getErrorMetrics();
 
-        Mockito.reset(timestampGenerator);
-        long execStartCount = errors.getSpeculativeExecutions().getCount();
+        // The check is attempted up to 10 times to account for the small possibility that a
+        // scheduled execution is not needed/exercised.  Even though the policy is set up
+        // to schedule an execution after 1ms, the timeout might not fire before the response is received.
+        int tryCount = 0;
+        int maxTries = 10;
+        while (tryCount++ < maxTries) {
+            Mockito.reset(timestampGenerator);
+            long execStartCount = errors.getSpeculativeExecutions().getCount();
 
-        BatchStatement batch = new BatchStatement();
-        for (int k = 0; k < 1000; k++) {
-            batch.add(new SimpleStatement("insert into foo(k,v) values (?,1)", k));
+            BatchStatement batch = new BatchStatement();
+            for (int k = 0; k < 1000; k++) {
+                batch.add(new SimpleStatement("insert into foo(k,v) values (?,1)", k).setIdempotent(true));
+            }
+            batch.setIdempotent(true);
+            session().execute(batch);
+
+            if (errors.getSpeculativeExecutions().getCount() == execStartCount + 1) {
+                Mockito.verify(timestampGenerator, times(1)).next();
+                break;
+            }
         }
-        session().execute(batch);
 
-        assertThat(errors.getSpeculativeExecutions().getCount()).isEqualTo(execStartCount + 1);
-        Mockito.verify(timestampGenerator, times(1)).next();
+        if (tryCount == maxTries) {
+            fail("Observed no speculative executions in 10 attempts");
+        }
     }
 }