Skip to content

Commit c4c67dd

Browse files
committed
updates
1 parent dec3ddf commit c4c67dd

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

mongo/integration/unified_spec_test.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const (
4242
gridFSFiles = "fs.files"
4343
gridFSChunks = "fs.chunks"
4444
spec1403SkipReason = "servers less than 4.2 do not have mongocryptd; see SPEC-1403"
45+
godriver2466SkipReason = "test has not been updated; see GODRIVER-2466"
4546
godriver2413SkipReason = "encryptedFields argument is not supported on Collection.Drop; see GODRIVER-2413"
4647
)
4748

@@ -51,10 +52,12 @@ var (
5152
// SPEC-1403: This test checks to see if the correct error is thrown when auto encrypting with a server < 4.2.
5253
// Currently, the test will fail because a server < 4.2 wouldn't have mongocryptd, so Client construction
5354
// would fail with a mongocryptd spawn error.
54-
"operation fails with maxWireVersion < 8": spec1403SkipReason,
55-
"CreateCollection from encryptedFields.": godriver2413SkipReason,
56-
"DropCollection from encryptedFields": godriver2413SkipReason,
57-
"DropCollection from remote encryptedFields": godriver2413SkipReason,
55+
"operation fails with maxWireVersion < 8": spec1403SkipReason,
56+
// GODRIVER-2466: The test below has not been updated as required.
57+
"Network error on minPoolSize background creation": godriver2466SkipReason,
58+
"CreateCollection from encryptedFields.": godriver2413SkipReason,
59+
"DropCollection from encryptedFields": godriver2413SkipReason,
60+
"DropCollection from remote encryptedFields": godriver2413SkipReason,
5861
}
5962
)
6063

mongo/options/clientoptions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func (c *ClientOptions) validate() error {
315315
// Direct connections cannot be made if multiple hosts are specified or an SRV URI is used.
316316
if c.Direct != nil && *c.Direct {
317317
if len(c.Hosts) > 1 {
318-
return fmt.Errorf("a direct connection cannot be made if multiple hosts are specified: %v", c.Hosts)
318+
return errors.New("a direct connection cannot be made if multiple hosts are specified")
319319
}
320320
if c.cs != nil && c.cs.Scheme == connstring.SchemeMongoDBSRV {
321321
return errors.New("a direct connection cannot be made if an SRV URI is used")

mongo/options/clientoptions_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ func TestClientOptions(t *testing.T) {
600600
})
601601
t.Run("direct connection validation", func(t *testing.T) {
602602
t.Run("multiple hosts", func(t *testing.T) {
603-
expectedErr := errors.New("a direct connection cannot be made if multiple hosts are specified: [localhost localhost2]")
603+
expectedErr := errors.New("a direct connection cannot be made if multiple hosts are specified")
604604

605605
testCases := []struct {
606606
name string

0 commit comments

Comments
 (0)