Revert "Sync server discovery integration spec tests"

This reverts commit 4a08efb. JAVA-4677
mongodb · Jul 14, 2022 · 4a609f5 · 4a609f5
1 parent 4a08efb
commit 4a609f5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 19 deletions.
diff --git a/...e/src/test/resources/server-discovery-and-monitoring-integration/hello-command-error.json b/...e/src/test/resources/server-discovery-and-monitoring-integration/hello-command-error.json
@@ -117,7 +117,7 @@
             "failPoint": {
               "configureFailPoint": "failCommand",
               "mode": {
-                "times": 4
+                "times": 2
               },
               "data": {
                 "failCommands": [
@@ -162,6 +162,22 @@
               }
             ]
           }
+        },
+        {
+          "name": "assertEventCount",
+          "object": "testRunner",
+          "arguments": {
+            "event": "ServerMarkedUnknownEvent",
+            "count": 1
+          }
+        },
+        {
+          "name": "assertEventCount",
+          "object": "testRunner",
+          "arguments": {
+            "event": "PoolClearedEvent",
+            "count": 1
+          }
         }
       ],
       "expectations": [

diff --git a/...e/src/test/resources/server-discovery-and-monitoring-integration/hello-network-error.json b/...e/src/test/resources/server-discovery-and-monitoring-integration/hello-network-error.json
@@ -116,7 +116,7 @@
             "failPoint": {
               "configureFailPoint": "failCommand",
               "mode": {
-                "times": 4
+                "times": 2
               },
               "data": {
                 "failCommands": [

diff --git a/...er-core/src/test/resources/server-discovery-and-monitoring-integration/hello-timeout.json b/...er-core/src/test/resources/server-discovery-and-monitoring-integration/hello-timeout.json
@@ -117,7 +117,7 @@
             "failPoint": {
               "configureFailPoint": "failCommand",
               "mode": {
-                "times": 4
+                "times": 2
               },
               "data": {
                 "failCommands": [
@@ -160,6 +160,22 @@
               }
             ]
           }
+        },
+        {
+          "name": "assertEventCount",
+          "object": "testRunner",
+          "arguments": {
+            "event": "ServerMarkedUnknownEvent",
+            "count": 1
+          }
+        },
+        {
+          "name": "assertEventCount",
+          "object": "testRunner",
+          "arguments": {
+            "event": "PoolClearedEvent",
+            "count": 1
+          }
         }
       ],
       "expectations": [

diff --git a/...urces/server-discovery-and-monitoring-integration/rediscover-quickly-after-step-down.json b/...urces/server-discovery-and-monitoring-integration/rediscover-quickly-after-step-down.json
@@ -45,27 +45,14 @@
           "name": "recordPrimary",
           "object": "testRunner"
         },
-        {
-          "name": "runAdminCommand",
-          "object": "testRunner",
-          "command_name": "replSetFreeze",
-          "arguments": {
-            "command": {
-              "replSetFreeze": 0
-            },
-            "readPreference": {
-              "mode": "Secondary"
-            }
-          }
-        },
         {
           "name": "runAdminCommand",
           "object": "testRunner",
           "command_name": "replSetStepDown",
           "arguments": {
             "command": {
-              "replSetStepDown": 30,
-              "secondaryCatchUpPeriodSecs": 30,
+              "replSetStepDown": 1,
+              "secondaryCatchUpPeriodSecs": 1,
               "force": false
             }
           }
@@ -74,7 +61,7 @@
           "name": "waitForPrimaryChange",
           "object": "testRunner",
           "arguments": {
-            "timeoutMS": 15000
+            "timeoutMS": 5000
           }
         },
         {