PYTHON-3712 Deprecate sharded-replicaset topology type and clean up redundant runOnRequirements (#2232)

blink1073 · web-flow · commit 4e5166b29a5a · 2025-03-26T17:39:10.000-05:00
diff --git a/test/__init__.py b/test/__init__.py
@@ -678,7 +678,6 @@ def is_topology_type(self, topologies):
             "single",
             "replicaset",
             "sharded",
-            "sharded-replicaset",
             "load-balanced",
         }
         if unknown:
@@ -693,16 +692,6 @@ def is_topology_type(self, topologies):
             return True
         if "sharded" in topologies and self.is_mongos:
             return True
-        if "sharded-replicaset" in topologies and self.is_mongos:
-            shards = client_context.client.config.shards.find().to_list()
-            for shard in shards:
-                # For a 3-member RS-backed sharded cluster, shard['host']
-                # will be 'replicaName/ip1:port1,ip2:port2,ip3:port3'
-                # Otherwise it will be 'ip1:port1'
-                host_spec = shard["host"]
-                if not len(host_spec.split("/")) > 1:
-                    return False
-            return True
         return False
 
     def require_cluster_type(self, topologies=None):
diff --git a/test/asynchronous/__init__.py b/test/asynchronous/__init__.py
@@ -680,7 +680,6 @@ async def is_topology_type(self, topologies):
             "single",
             "replicaset",
             "sharded",
-            "sharded-replicaset",
             "load-balanced",
         }
         if unknown:
@@ -695,16 +694,6 @@ async def is_topology_type(self, topologies):
             return True
         if "sharded" in topologies and self.is_mongos:
             return True
-        if "sharded-replicaset" in topologies and self.is_mongos:
-            shards = await async_client_context.client.config.shards.find().to_list()
-            for shard in shards:
-                # For a 3-member RS-backed sharded cluster, shard['host']
-                # will be 'replicaName/ip1:port1,ip2:port2,ip3:port3'
-                # Otherwise it will be 'ip1:port1'
-                host_spec = shard["host"]
-                if not len(host_spec.split("/")) > 1:
-                    return False
-            return True
         return False
 
     def require_cluster_type(self, topologies=None):
diff --git a/test/change_streams/unified/change-streams-clusterTime.json b/test/change_streams/unified/change-streams-clusterTime.json
@@ -28,7 +28,6 @@
       "minServerVersion": "4.0.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
         "load-balanced",
         "sharded"
       ],
diff --git a/test/change_streams/unified/change-streams-disambiguatedPaths.json b/test/change_streams/unified/change-streams-disambiguatedPaths.json
@@ -28,7 +28,6 @@
       "minServerVersion": "6.1.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
         "load-balanced",
         "sharded"
       ],
diff --git a/test/change_streams/unified/change-streams-errors.json b/test/change_streams/unified/change-streams-errors.json
@@ -145,7 +145,7 @@
           "minServerVersion": "4.1.11",
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }
@@ -190,7 +190,7 @@
           "minServerVersion": "4.2",
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }
diff --git a/test/change_streams/unified/change-streams-pre_and_post_images.json b/test/change_streams/unified/change-streams-pre_and_post_images.json
@@ -6,7 +6,7 @@
       "minServerVersion": "6.0.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ],
       "serverless": "forbid"
diff --git a/test/change_streams/unified/change-streams-resume-allowlist.json b/test/change_streams/unified/change-streams-resume-allowlist.json
@@ -6,7 +6,7 @@
       "minServerVersion": "3.6",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ],
       "serverless": "forbid"
diff --git a/test/change_streams/unified/change-streams-resume-errorLabels.json b/test/change_streams/unified/change-streams-resume-errorLabels.json
@@ -6,7 +6,7 @@
       "minServerVersion": "4.3.1",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ],
       "serverless": "forbid"
diff --git a/test/change_streams/unified/change-streams-showExpandedEvents.json b/test/change_streams/unified/change-streams-showExpandedEvents.json
@@ -6,9 +6,9 @@
       "minServerVersion": "6.0.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
         "sharded"
-      ]
+      ],
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
@@ -462,7 +462,6 @@
       "runOnRequirements": [
         {
           "topologies": [
-            "sharded-replicaset",
             "sharded"
           ]
         }
diff --git a/test/csot/tailable-awaitData.json b/test/csot/tailable-awaitData.json
@@ -3,7 +3,8 @@
   "schemaVersion": "1.9",
   "runOnRequirements": [
     {
-      "minServerVersion": "4.4"
+      "minServerVersion": "4.4",
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
@@ -417,6 +418,141 @@
           ]
         }
       ]
+    },
+    {
+      "description": "apply remaining timeoutMS if less than maxAwaitTimeMS",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "failPointClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "blockConnection": true,
+                "blockTimeMS": 30
+              }
+            }
+          }
+        },
+        {
+          "name": "createFindCursor",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "cursorType": "tailableAwait",
+            "batchSize": 1,
+            "maxAwaitTimeMS": 100,
+            "timeoutMS": 200
+          },
+          "saveResultAsEntity": "tailableCursor"
+        },
+        {
+          "name": "iterateOnce",
+          "object": "tailableCursor"
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "tailableCursor",
+          "expectError": {
+            "isTimeoutError": true
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "commandName": "find",
+                "databaseName": "test"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "commandName": "getMore",
+                "databaseName": "test",
+                "command": {
+                  "maxTimeMS": {
+                    "$$lte": 100
+                  }
+                }
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "commandName": "getMore",
+                "databaseName": "test",
+                "command": {
+                  "maxTimeMS": {
+                    "$$lte": 70
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "apply maxAwaitTimeMS if less than remaining timeout",
+      "operations": [
+        {
+          "name": "createFindCursor",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "cursorType": "tailableAwait",
+            "batchSize": 1,
+            "maxAwaitTimeMS": 100,
+            "timeoutMS": 200
+          },
+          "saveResultAsEntity": "tailableCursor"
+        },
+        {
+          "name": "iterateOnce",
+          "object": "tailableCursor"
+        },
+        {
+          "name": "iterateOnce",
+          "object": "tailableCursor"
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "commandName": "find",
+                "databaseName": "test"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "commandName": "getMore",
+                "databaseName": "test",
+                "command": {
+                  "maxTimeMS": {
+                    "$$lte": 100
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
@@ -5,8 +5,7 @@
     {
       "topologies": [
         "single",
-        "sharded",
-        "sharded-replicaset"
+        "sharded"
       ],
       "serverless": "forbid"
     }
diff --git a/test/run_command/unified/runCommand.json b/test/run_command/unified/runCommand.json
@@ -229,7 +229,6 @@
         {
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
             "load-balanced",
             "sharded"
           ]
@@ -493,7 +492,7 @@
         {
           "minServerVersion": "4.2",
           "topologies": [
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }
diff --git a/test/sessions/driver-sessions-dirty-session-errors.json b/test/sessions/driver-sessions-dirty-session-errors.json
@@ -11,7 +11,7 @@
     {
       "minServerVersion": "4.1.8",
       "topologies": [
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/test/sessions/snapshot-sessions-unsupported-ops.json b/test/sessions/snapshot-sessions-unsupported-ops.json
@@ -6,7 +6,7 @@
       "minServerVersion": "5.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/test/sessions/snapshot-sessions.json b/test/sessions/snapshot-sessions.json
@@ -6,7 +6,7 @@
       "minServerVersion": "5.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/test/unified-test-format/valid-pass/operator-lte.json b/test/unified-test-format/valid-pass/operator-lte.json
@@ -42,7 +42,9 @@
           "arguments": {
             "document": {
               "_id": 1,
-              "y": 1
+              "x": 2,
+              "y": 3,
+              "z": 4
             }
           }
         }
@@ -58,10 +60,18 @@
                   "documents": [
                     {
                       "_id": {
-                        "$$lte": 1
+                        "$$lte": 2
+                      },
+                      "x": {
+                        "$$lte": 2.1
                       },
                       "y": {
-                        "$$lte": 2
+                        "$$lte": {
+                          "$numberLong": "3"
+                        }
+                      },
+                      "z": {
+                        "$$lte": 4
                       }
                     }
                   ]
diff --git a/test/versioned-api/transaction-handling.json b/test/versioned-api/transaction-handling.json
@@ -6,7 +6,7 @@
       "minServerVersion": "4.9",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ]
     }
@@ -92,7 +92,7 @@
         {
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }
@@ -221,7 +221,7 @@
         {
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@`
`145`	`145`	`"minServerVersion": "4.1.11",`
`146`	`146`	`"topologies": [`
`147`	`147`	`"replicaset",`
`148`		`- "sharded-replicaset",`
	`148`	`+ "sharded",`
`149`	`149`	`"load-balanced"`
`150`	`150`	`]`
`151`	`151`	`}`
`@@ -190,7 +190,7 @@`
`190`	`190`	`"minServerVersion": "4.2",`
`191`	`191`	`"topologies": [`
`192`	`192`	`"replicaset",`
`193`		`- "sharded-replicaset",`
	`193`	`+ "sharded",`
`194`	`194`	`"load-balanced"`
`195`	`195`	`]`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`"minServerVersion": "6.0.0",`
`7`	`7`	`"topologies": [`
`8`	`8`	`"replicaset",`
`9`		`- "sharded-replicaset",`
`10`	`9`	`"sharded"`
`11`		`- ]`
	`10`	`+ ],`
	`11`	`+ "serverless": "forbid"`
`12`	`12`	`}`
`13`	`13`	`],`
`14`	`14`	`"createEntities": [`
`@@ -462,7 +462,6 @@`
`462`	`462`	`"runOnRequirements": [`
`463`	`463`	`{`
`464`	`464`	`"topologies": [`
`465`		`- "sharded-replicaset",`
`466`	`465`	`"sharded"`
`467`	`466`	`]`
`468`	`467`	`}`