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

@@ -11,22 +11,23 @@ import "testing"
 // skipTests is a map of "fully-qualified test name" to "the reason for skipping
 // the test".
 var skipTests = map[string]string{
-	"TestURIOptionsSpec/single-threaded-options.json/Valid_options_specific_to_single-threaded_drivers_are_parsed_correctly": "the Go Driver is not single-threaded.",
+	"TestURIOptionsSpec/single-threaded-options.json/Valid_options_specific_to_single-threaded_drivers_are_parsed_correctly": "The Go Driver is not single-threaded.",
+
 	// GODRIVER-2348: The wtimeoutMS write concern option is not supported.
-	"TestURIOptionsSpec/concern-options.json/Valid_read_and_write_concern_are_parsed_correctly": "the wtimeoutMS write concern option is not supported",
+	"TestURIOptionsSpec/concern-options.json/Valid_read_and_write_concern_are_parsed_correctly": "The wtimeoutMS write concern option is not supported",
 
 	// SPEC-1403: This test checks to see if the correct error is thrown when
 	// auto encrypting with a server < 4.2. Currently, the test will fail
 	// because a server < 4.2 wouldn't have mongocryptd, so Client construction
 	// would fail with a mongocryptd spawn error.
-	"TestClientSideEncryptionSpec/maxWireVersion.json/operation_fails_with_maxWireVersion_<_8": "servers less than 4.2 do not have mongocryptd; see SPEC-1403",
+	"TestClientSideEncryptionSpec/maxWireVersion.json/operation_fails_with_maxWireVersion_<_8": "Servers less than 4.2 do not have mongocryptd; see SPEC-1403",
 
 	// GODRIVER-1827: These 2 tests assert that in-use connections are not
 	// closed until checked back into a closed pool, but the Go connection pool
 	// aggressively closes in-use connections. That behavior is currently
 	// required by the "Client.Disconnect" API, so skip the tests.
-	"TestCMAPSpec/pool-close-destroy-conns.json/When_a_pool_is_closed,_it_MUST_first_destroy_all_available_connections_in_that_pool": "test requires that close does not aggressively close used connections",
-	"TestCMAPSpec/pool-close-destroy-conns.json/must_destroy_checked_in_connection_if_pool_has_been_closed":                          "test requires that close does not aggressively close used connections",
+	"TestCMAPSpec/pool-close-destroy-conns.json/When_a_pool_is_closed,_it_MUST_first_destroy_all_available_connections_in_that_pool": "Test requires that close does not aggressively close used connections",
+	"TestCMAPSpec/pool-close-destroy-conns.json/must_destroy_checked_in_connection_if_pool_has_been_closed":                          "Test requires that close does not aggressively close used connections",
 
 	// GODRIVER-1826: The load-balancer SDAM error handling test "errors during
 	// authentication are processed" currently asserts that handshake errors
@@ -40,7 +41,7 @@ var skipTests = map[string]string{
 	// TODO(DRIVERS-1785): Re-enable this test once the spec test is updated to
 	// use the same event order as the "errors during authentication are
 	// processed" load-balancer SDAM spec test.
-	"TestCMAPSpec/pool-create-min-size-error.json/error_during_minPoolSize_population_clears_pool": "event ordering is incompatible with load-balancer SDAM spec test (DRIVERS-1785)",
+	"TestCMAPSpec/pool-create-min-size-error.json/error_during_minPoolSize_population_clears_pool": "Event ordering is incompatible with load-balancer SDAM spec test (DRIVERS-1785)",
 
 	// GODRIVER-1826: The Go connection pool does not currently always deliver
 	// connections created by maintain() to waiting check-outs. There is a race
@@ -53,7 +54,7 @@ var skipTests = map[string]string{
 	//
 	// TODO(DRIVERS-2225): Re-enable this test once the spec test is updated to
 	// support the Go pool minPoolSize maintain() behavior.
-	"TestCMAPSpec/pool-checkout-minPoolSize-connection-maxConnecting.json/threads_blocked_by_maxConnecting_check_out_minPoolSize_connections": "test requires that connections established by minPoolSize are immediately used to satisfy check-out requests (DRIVERS-2225)",
+	"TestCMAPSpec/pool-checkout-minPoolSize-connection-maxConnecting.json/threads_blocked_by_maxConnecting_check_out_minPoolSize_connections": "Test requires that connections established by minPoolSize are immediately used to satisfy check-out requests (DRIVERS-2225)",
 
 	// GODRIVER-1826: The Go connection pool currently delivers any available
 	// connection to the earliest waiting check-out request, independent of if
@@ -64,10 +65,10 @@ var skipTests = map[string]string{
 	//
 	// TODO(DRIVERS-2223): Re-enable this test once the spec test is updated to
 	// support the Go pool check-in behavior.
-	"TestCMAPSpec/pool-checkout-returned-connection-maxConnecting.json/threads_blocked_by_maxConnecting_check_out_returned_connections": "test requires a checked-in connections cannot satisfy a check-out waiting on a new connection (DRIVERS-2223)",
+	"TestCMAPSpec/pool-checkout-returned-connection-maxConnecting.json/threads_blocked_by_maxConnecting_check_out_returned_connections": "Test requires a checked-in connections cannot satisfy a check-out waiting on a new connection (DRIVERS-2223)",
 
 	// TODO(GODRIVER-2129): Re-enable this test once GODRIVER-2129 is done.
-	"TestAuthSpec/connection-string.json/must_raise_an_error_when_the_hostname_canonicalization_is_invalid": "support will be added with GODRIVER-2129.",
+	"TestAuthSpec/connection-string.json/must_raise_an_error_when_the_hostname_canonicalization_is_invalid": "Support will be added with GODRIVER-2129.",
 
 	// GODRIVER-1773: This test runs a "find" with limit=4 and batchSize=3. It
 	// expects batchSize values of three for the "find" and one for the
@@ -78,9 +79,9 @@ var skipTests = map[string]string{
 	// GODRIVER-2577: The following spec tests require canceling ops
 	// immediately, but the current logic clears pools and cancels in-progress
 	// ops after two the heartbeat failures.
-	"TestUnifiedSpec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json/Connection_pool_clear_uses_interruptInUseConnections=true_after_monitor_timeout":                      "Godriver clears after multiple timeout",
-	"TestUnifiedSpec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json/Error_returned_from_connection_pool_clear_with_interruptInUseConnections=true_is_retryable":           "Godriver clears after multiple timeout",
-	"TestUnifiedSpec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json/Error_returned_from_connection_pool_clear_with_interruptInUseConnections=true_is_retryable_for_write": "Godriver clears after multiple timeout",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json/Connection_pool_clear_uses_interruptInUseConnections=true_after_monitor_timeout":                      "Go Driver clears after multiple timeout",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json/Error_returned_from_connection_pool_clear_with_interruptInUseConnections=true_is_retryable":           "Go Driver clears after multiple timeout",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json/Error_returned_from_connection_pool_clear_with_interruptInUseConnections=true_is_retryable_for_write": "Go Driver clears after multiple timeout",
 
 	// TODO(GODRIVER-2843): Fix and unskip these test cases.
 	"TestUnifiedSpec/sessions/snapshot-sessions.json/Find_operation_with_snapshot":                                      "Test fails frequently. See GODRIVER-2843",
@@ -135,6 +136,28 @@ 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".
+	//
+	// Need to 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 following log message has been removed from the
+	// JSON analogue because it assumes that "TopologyDescriptionChangedEvent"
+	// should occur when a topolgoy is closed. This behavior is not clearly
+	// defined anywhere and some drivers support and some don't.
+	//
+	// Need to 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: