From fb7629f62ab2625aef1489b436a5c8f26acc7b47 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 14 Aug 2023 21:50:00 -0500 Subject: [PATCH 1/6] GODRIVER-2943 Fix failing logging tests --- mongo/integration/unified_spec_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mongo/integration/unified_spec_test.go b/mongo/integration/unified_spec_test.go index c12df5f6ea..a22ac9644b 100644 --- a/mongo/integration/unified_spec_test.go +++ b/mongo/integration/unified_spec_test.go @@ -44,6 +44,7 @@ const ( spec1403SkipReason = "servers less than 4.2 do not have mongocryptd; see SPEC-1403" godriver2123SkipReason = "failpoints and timeouts together cause failures; see GODRIVER-2123" godriver2413SkipReason = "encryptedFields argument is not supported on Collection.Drop; see GODRIVER-2413" + godriver2943SkipReason = "logging test is failing" ) var ( @@ -61,6 +62,7 @@ var ( "CreateCollection from encryptedFields.": godriver2413SkipReason, "DropCollection from encryptedFields": godriver2413SkipReason, "DropCollection from remote encryptedFields": godriver2413SkipReason, + "Topology LifeCycle": godriver2943SkipReason } ) From c11840ebc1e484724dbf508c0e0abc9f495ecc11 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 14 Aug 2023 21:59:43 -0500 Subject: [PATCH 2/6] syntax --- mongo/integration/unified_spec_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongo/integration/unified_spec_test.go b/mongo/integration/unified_spec_test.go index a22ac9644b..9895c11895 100644 --- a/mongo/integration/unified_spec_test.go +++ b/mongo/integration/unified_spec_test.go @@ -62,7 +62,7 @@ var ( "CreateCollection from encryptedFields.": godriver2413SkipReason, "DropCollection from encryptedFields": godriver2413SkipReason, "DropCollection from remote encryptedFields": godriver2413SkipReason, - "Topology LifeCycle": godriver2943SkipReason + "Topology LifeCycle": godriver2943SkipReason, } ) From 557ae60d5310a4b62a6dafd0d86b9f1d810feb7f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Aug 2023 08:10:14 -0500 Subject: [PATCH 3/6] formatting and case --- mongo/integration/unified_spec_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongo/integration/unified_spec_test.go b/mongo/integration/unified_spec_test.go index 9895c11895..7521b53a2f 100644 --- a/mongo/integration/unified_spec_test.go +++ b/mongo/integration/unified_spec_test.go @@ -62,7 +62,7 @@ var ( "CreateCollection from encryptedFields.": godriver2413SkipReason, "DropCollection from encryptedFields": godriver2413SkipReason, "DropCollection from remote encryptedFields": godriver2413SkipReason, - "Topology LifeCycle": godriver2943SkipReason, + "Topology lifecycle": godriver2943SkipReason, } ) From 84324b000bb44025d6e812e63c34e86860f4ab89 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Aug 2023 09:40:36 -0500 Subject: [PATCH 4/6] try again --- mongo/integration/unified_spec_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongo/integration/unified_spec_test.go b/mongo/integration/unified_spec_test.go index 7521b53a2f..c7cb7075d6 100644 --- a/mongo/integration/unified_spec_test.go +++ b/mongo/integration/unified_spec_test.go @@ -62,7 +62,7 @@ var ( "CreateCollection from encryptedFields.": godriver2413SkipReason, "DropCollection from encryptedFields": godriver2413SkipReason, "DropCollection from remote encryptedFields": godriver2413SkipReason, - "Topology lifecycle": godriver2943SkipReason, + "Topology_lifecycle": godriver2943SkipReason, } ) From 44df297612e0d6422adb2d2e0583646fb8e1c36e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Aug 2023 06:42:01 -0500 Subject: [PATCH 5/6] proper skip --- mongo/integration/unified/unified_spec_runner.go | 3 +++ mongo/integration/unified_spec_test.go | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mongo/integration/unified/unified_spec_runner.go b/mongo/integration/unified/unified_spec_runner.go index 7aff3f41d2..4ff2aa6066 100644 --- a/mongo/integration/unified/unified_spec_runner.go +++ b/mongo/integration/unified/unified_spec_runner.go @@ -30,6 +30,9 @@ var ( // TODO(GODRIVER-2843): Fix and unskip these test cases. "Find operation with snapshot": "Test fails frequently. See GODRIVER-2843", "Write commands with snapshot session do not affect snapshot reads": "Test fails frequently. See GODRIVER-2843", + // TODO(GODRIVER-2943): Fix and unskip this test case. + "Topology lifecycle": " + Test times out. See GODRIVER-2943" } logMessageValidatorTimeout = 10 * time.Millisecond diff --git a/mongo/integration/unified_spec_test.go b/mongo/integration/unified_spec_test.go index c7cb7075d6..0c51359abe 100644 --- a/mongo/integration/unified_spec_test.go +++ b/mongo/integration/unified_spec_test.go @@ -44,7 +44,6 @@ const ( spec1403SkipReason = "servers less than 4.2 do not have mongocryptd; see SPEC-1403" godriver2123SkipReason = "failpoints and timeouts together cause failures; see GODRIVER-2123" godriver2413SkipReason = "encryptedFields argument is not supported on Collection.Drop; see GODRIVER-2413" - godriver2943SkipReason = "logging test is failing" ) var ( @@ -61,8 +60,7 @@ var ( "Network error on minPoolSize background creation": godriver2123SkipReason, "CreateCollection from encryptedFields.": godriver2413SkipReason, "DropCollection from encryptedFields": godriver2413SkipReason, - "DropCollection from remote encryptedFields": godriver2413SkipReason, - "Topology_lifecycle": godriver2943SkipReason, + "DropCollection from remote encryptedFields": godriver2413SkipReason } ) From dd381e6e10a361ef1e891dd52d955144a24036c7 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Aug 2023 06:52:10 -0500 Subject: [PATCH 6/6] cleanup --- mongo/integration/unified/unified_spec_runner.go | 3 +-- mongo/integration/unified_spec_test.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mongo/integration/unified/unified_spec_runner.go b/mongo/integration/unified/unified_spec_runner.go index 4ff2aa6066..1b1cbeb533 100644 --- a/mongo/integration/unified/unified_spec_runner.go +++ b/mongo/integration/unified/unified_spec_runner.go @@ -31,8 +31,7 @@ var ( "Find operation with snapshot": "Test fails frequently. See GODRIVER-2843", "Write commands with snapshot session do not affect snapshot reads": "Test fails frequently. See GODRIVER-2843", // TODO(GODRIVER-2943): Fix and unskip this test case. - "Topology lifecycle": " - Test times out. See GODRIVER-2943" + "Topology lifecycle": "Test times out. See GODRIVER-2943", } logMessageValidatorTimeout = 10 * time.Millisecond diff --git a/mongo/integration/unified_spec_test.go b/mongo/integration/unified_spec_test.go index 0c51359abe..c12df5f6ea 100644 --- a/mongo/integration/unified_spec_test.go +++ b/mongo/integration/unified_spec_test.go @@ -60,7 +60,7 @@ var ( "Network error on minPoolSize background creation": godriver2123SkipReason, "CreateCollection from encryptedFields.": godriver2413SkipReason, "DropCollection from encryptedFields": godriver2413SkipReason, - "DropCollection from remote encryptedFields": godriver2413SkipReason + "DropCollection from remote encryptedFields": godriver2413SkipReason, } )