DRIVERS-1725 Unskip failCommand+appName tests on MongoDB 4.4.7+ (#1612)

mongodb · Aug 6, 2024 · a35de87 · a35de87
1 parent 121be10
commit a35de87
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 19 deletions.
diff --git a/source/client-side-operations-timeout/tests/command-execution.json b/source/client-side-operations-timeout/tests/command-execution.json
diff --git a/source/client-side-operations-timeout/tests/command-execution.yml b/source/client-side-operations-timeout/tests/command-execution.yml
@@ -3,9 +3,8 @@ description: "timeoutMS behaves correctly during command execution"
 schemaVersion: "1.9"
 
 runOnRequirements:
-  # The appName filter cannot be used to set a fail point on connection handshakes until server version 4.9 due to
-  # SERVER-49220/SERVER-49336.
-  - minServerVersion: "4.9"
+  # Require SERVER-49336 for failCommand + appName on the initial handshake.
+  - minServerVersion: "4.4.7"
     # Skip load-balanced and serverless which do not support RTT measurements.
     topologies: [ single, replicaset, sharded ]
     serverless: forbid

diff --git a/source/load-balancers/tests/sdam-error-handling.json b/source/load-balancers/tests/sdam-error-handling.json
diff --git a/source/load-balancers/tests/sdam-error-handling.yml b/source/load-balancers/tests/sdam-error-handling.yml
@@ -141,9 +141,8 @@ tests:
   # to the same mongos on which the failpoint is set.
   - description: errors during the initial connection hello are ignored
     runOnRequirements:
-      # Server version 4.9+ is needed to set a fail point on the initial
-      # connection handshake with the appName filter due to SERVER-49336.
-      - minServerVersion: '4.9'
+      # Require SERVER-49336 for failCommand + appName on the initial handshake.
+      - minServerVersion: '4.4.7'
     operations:
       - name: failPoint
         object: testRunner

diff --git a/source/server-discovery-and-monitoring/tests/unified/hello-command-error.json b/source/server-discovery-and-monitoring/tests/unified/hello-command-error.json
diff --git a/source/server-discovery-and-monitoring/tests/unified/hello-command-error.yml b/source/server-discovery-and-monitoring/tests/unified/hello-command-error.yml
@@ -4,8 +4,8 @@ description: hello-command-error
 schemaVersion: "1.4"
 
 runOnRequirements:
-    # failCommand appName requirements
-  - minServerVersion: "4.9"
+  # Require SERVER-49336 for failCommand + appName on the initial handshake.
+  - minServerVersion: "4.4.7"
     serverless: forbid
     topologies: [ single, replicaset, sharded ]
 

diff --git a/source/server-discovery-and-monitoring/tests/unified/hello-network-error.json b/source/server-discovery-and-monitoring/tests/unified/hello-network-error.json
diff --git a/source/server-discovery-and-monitoring/tests/unified/hello-network-error.yml b/source/server-discovery-and-monitoring/tests/unified/hello-network-error.yml
@@ -4,8 +4,8 @@ description: hello-network-error
 schemaVersion: "1.4"
 
 runOnRequirements:
-    # failCommand appName requirements
-  - minServerVersion: "4.9"
+  # Require SERVER-49336 for failCommand + appName on the initial handshake.
+  - minServerVersion: "4.4.7"
     serverless: forbid
     topologies: [ single, replicaset, sharded ]
 

diff --git a/source/server-discovery-and-monitoring/tests/unified/interruptInUse-pool-clear.json b/source/server-discovery-and-monitoring/tests/unified/interruptInUse-pool-clear.json
diff --git a/source/server-discovery-and-monitoring/tests/unified/interruptInUse-pool-clear.yml b/source/server-discovery-and-monitoring/tests/unified/interruptInUse-pool-clear.yml
@@ -5,7 +5,7 @@ schemaVersion: "1.11"
 
 runOnRequirements:
   # failCommand appName requirements
-  - minServerVersion: "4.9"
+  - minServerVersion: "4.4"
     serverless: forbid
     topologies: [ replicaset, sharded ]
 

diff --git a/source/server-discovery-and-monitoring/tests/unified/minPoolSize-error.json b/source/server-discovery-and-monitoring/tests/unified/minPoolSize-error.json
diff --git a/source/server-discovery-and-monitoring/tests/unified/minPoolSize-error.yml b/source/server-discovery-and-monitoring/tests/unified/minPoolSize-error.yml
@@ -4,8 +4,8 @@ description: minPoolSize-error
 schemaVersion: "1.4"
 
 runOnRequirements:
-    # failCommand appName requirements
-  - minServerVersion: "4.9"
+  # Require SERVER-49336 for failCommand + appName on the initial handshake.
+  - minServerVersion: "4.4.7"
     serverless: forbid
     topologies:
       - single