WIP

Author: jyemin

driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedRetryableReadsTest.java

@@ -25,14 +25,16 @@
 import java.util.Collection;
 
 import static com.mongodb.client.unified.UnifiedRetryableReadsTest.customSkips;
-import static org.junit.Assume.assumeFalse;
 
 public class UnifiedRetryableReadsTest extends UnifiedReactiveStreamsTest {
     public UnifiedRetryableReadsTest(final String fileDescription, final String testDescription, final String schemaVersion,
             final BsonArray runOnRequirements, final BsonArray entitiesArray, final BsonArray initialData, final BsonDocument definition) {
         super(schemaVersion, runOnRequirements, entitiesArray, initialData, definition);
         customSkips(fileDescription, testDescription);
-        assumeFalse(testDescription.contains("createChangeStream succeeds after retryable handshake"));
+        // The reactive driver will execute extra getMore commands for change streams.  Ignore them.
+        if (fileDescription.startsWith("changeStreams") || testDescription.contains("ChangeStream")) {
+            ignoreExtraEvents();
+        }
     }
 
     @Parameterized.Parameters(name = "{0}: {1}")

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java

@@ -109,6 +109,7 @@ public abstract class UnifiedTest {
     private final UnifiedClientEncryptionHelper clientEncryptionHelper = new UnifiedClientEncryptionHelper(entities);
     private final List<FailPoint> failPoints = new ArrayList<>();
     private final UnifiedTestContext rootContext = new UnifiedTestContext();
+    private boolean ignoreExtraEvents;
     private BsonDocument startingClusterTime;
 
     private class UnifiedTestContext {
@@ -151,6 +152,10 @@ public UnifiedTest(@Nullable final String fileDescription, final String schemaVe
         crudHelper = new UnifiedCrudHelper(entities, definition.getString("description").getValue());
     }
 
+    protected void ignoreExtraEvents() {
+        ignoreExtraEvents = true;
+    }
+
     public Entities getEntities() {
         return entities;
     }
@@ -277,7 +282,8 @@ private void compareEvents(final UnifiedTestContext context, final BsonDocument
         for (BsonValue cur : definition.getArray("expectEvents")) {
             BsonDocument curClientEvents = cur.asDocument();
             String client = curClientEvents.getString("client").getValue();
-            boolean ignoreExtraEvents = curClientEvents.getBoolean("ignoreExtraEvents", BsonBoolean.FALSE).getValue();
+            boolean ignoreExtraEvents =
+                    curClientEvents.getBoolean("ignoreExtraEvents", BsonBoolean.valueOf(this.ignoreExtraEvents)).getValue();
             String eventType = curClientEvents.getString("eventType", new BsonString("command")).getValue();
             BsonArray expectedEvents = curClientEvents.getArray("events");
             if (eventType.equals("command")) {