Updates to UnifiedTestModifications

Author: rozza

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

@@ -23,6 +23,7 @@
 import java.util.Collection;
 
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 
 // See https://github.com/mongodb/specifications/tree/master/source/client-side-operation-timeout/tests

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

@@ -71,7 +71,7 @@ public static void applyCustomizations(final TestDef def) {
         def.skipNoncompliantReactive("No good way to fulfill tryNext() requirement with a Publisher<T>")
                 .test("client-side-operation-timeout", "apply remaining timeoutMS if less than maxAwaitTimeMS");
 
-        def.retry("timeoutMS is very short")
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5839")
                 .test("client-side-operation-timeout", "timeoutMS applied to entire download, not individual parts");
 
         // TODO-JAVA-5712
@@ -93,6 +93,10 @@ public static void applyCustomizations(final TestDef def) {
                         + "response doesn't contain it.")
                 .file("command-logging-and-monitoring", "pre-42-server-connection-id");
 
+        def.skipNoncompliant("The driver doesn't reduce the batchSize for the getMore")
+                .test("command-logging-and-monitoring",
+                      "A successful find event with a getmore and the server kills the cursor (<= 4.4)");
+
         // connection-monitoring-and-pooling
 
         // TODO-JAVA-5711 reason, jira
@@ -271,6 +275,11 @@ public static void applyCustomizations(final TestDef def) {
                         + "server versions.")
                 .when(() -> serverVersionLessThan(4, 4))
                 .test("unified-test-format/tests/valid-pass", "poc-retryable-writes", "InsertOne fails after multiple retryable writeConcernErrors");
+
+        def.skipNoncompliant("The driver doesn't reduce the batchSize for the getMore")
+                .test("unified-test-format/tests/valid-pass",
+                        "A successful find event with a getmore and the server kills the cursor (<= 4.4)");
+
         def.skipJira("https://jira.mongodb.org/browse/JAVA-5389")
                 .file("unified-test-format/tests/valid-pass", "expectedEventsForClient-topologyDescriptionChangedEvent");
         def.skipJira("https://jira.mongodb.org/browse/JAVA-4862")