Merge pull request #1986 from matthewdale/godriver3098-sync-tests

GODRIVER-3098 Sync SDAM spec tests at 348d2f39.

Author: matthewdale

internal/integration/unified_spec_test.go

@@ -164,7 +164,6 @@ var directories = []string{
 	"convenient-transactions",
 	"retryable-reads/legacy",
 	"read-write-concern/operation",
-	"server-discovery-and-monitoring/integration",
 	"atlas-data-lake-testing",
 }
 

internal/spectest/skip.go

@@ -135,6 +135,23 @@ var skipTests = map[string]string{
 	//  (BadValue) cannot set maxTimeMS on getMore command for a non-awaitData cursor
 	//
 	"TestUnifiedSpec/client-side-operations-timeout/runCursorCommand.json/Non-tailable_cursor_lifetime_remaining_timeoutMS_applied_to_getMore_if_timeoutMode_is_unset": "maxTimeMS can't be set on a getMore. See DRIVERS-2953",
+
+	// TODO(GODRIVER-2466): Converting SDAM integration spec tests to unified
+	// test format requires implementing new test operations, such as
+	// "recordTopologyDescription". Un-skip whenever GODRIVER-2466 is completed.
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.json/Rediscover_quickly_after_replSetStepDown": "Implement GODRIVER-2466",
+
+	// TODO(GODRIVER-2967): The Go Driver doesn't currently emit a
+	// TopologyChangedEvent when a topology is closed. Un-skip whenever
+	// GODRIVER-2967 is completed.
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-loadbalanced.json/Topology_lifecycle":                            "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-sharded.json/Topology_lifecycle":                                 "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-replicaset.json/Topology_lifecycle":                              "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-standalone.json/Topology_lifecycle":                              "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.json/Topology_lifecycle": "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.json/Topology_lifecycle":      "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.json/Topology_lifecycle":   "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.json/Topology_lifecycle":   "Implement GODRIVER-2967",
 }
 
 // CheckSkip checks if the fully-qualified test name matches a skipped test

testdata/server-discovery-and-monitoring/integration/rediscover-quickly-after-step-down.json

@@ -11,7 +11,7 @@
             "helloOk": true,
             "isWritablePrimary": true,
             "minWireVersion": 0,
-            "maxWireVersion": 4
+            "maxWireVersion": 21
           }
         ]
       ],

testdata/server-discovery-and-monitoring/integration/rediscover-quickly-after-step-down.yml

@@ -5,7 +5,7 @@ phases:
     responses:
       -
         - "a:27017"
-        - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 4 }
+        - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 21 }
 
     outcome:
       events:

testdata/server-discovery-and-monitoring/monitoring/discovered_standalone.json

@@ -19,7 +19,7 @@
               "b:27017"
             ],
             "minWireVersion": 0,
-            "maxWireVersion": 6
+            "maxWireVersion": 21
           }
         ]
       ],

testdata/server-discovery-and-monitoring/monitoring/discovered_standalone.yml

@@ -17,7 +17,7 @@ phases:
             - "a:27017"
             - "b:27017"
           minWireVersion: 0
-          maxWireVersion: 6
+          maxWireVersion: 21
     outcome:
       events:
         -
@@ -110,4 +110,3 @@ phases:
                   hosts: []
                   passives: []
                   type: "PossiblePrimary"
-

testdata/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json

@@ -18,7 +18,7 @@
               "b:27017"
             ],
             "minWireVersion": 0,
-            "maxWireVersion": 6
+            "maxWireVersion": 21
           }
         ]
       ],

testdata/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml

@@ -16,7 +16,7 @@ phases:
             - "a:27017"
             - "b:27017"
           minWireVersion: 0
-          maxWireVersion: 6
+          maxWireVersion: 21
     outcome:
       events:
         -
@@ -109,4 +109,3 @@ phases:
                   hosts: []
                   passives: []
                   type: "Unknown"
-