From 49f85e624808489e0273f67bf965e653e13fdfdd Mon Sep 17 00:00:00 2001 From: Maxim Katcharov Date: Mon, 4 Nov 2024 15:40:24 -0700 Subject: [PATCH 1/2] Add flaky annotation to flaky tests --- .../AbstractClientSideEncryptionDecryptionEventsTest.java | 3 ++- .../client/AbstractClientSideOperationsTimeoutProseTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java index 2271f14ae86..63709cc4cbf 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java @@ -30,6 +30,7 @@ import com.mongodb.event.CommandSucceededEvent; import com.mongodb.fixture.EncryptionFixture; import com.mongodb.internal.connection.TestCommandListener; +import com.mongodb.test.FlakyTest; import org.bson.BsonBinary; import org.bson.BsonDocument; import org.bson.BsonString; @@ -174,7 +175,7 @@ public void networkError() { assertDoesNotThrow(() -> commandListener.getCommandFailedEvent("aggregate")); } - @Test + @FlakyTest(maxAttempts = 3) public void decryptError() { MongoCollection decryptionEvents = encryptedClient .getDatabase(getDefaultDatabaseName()) diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java index 418f874aabe..4806356f98b 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java @@ -282,7 +282,7 @@ public void testBlockingIterationMethodsChangeStream() { } @DisplayName("6. GridFS Upload - uploads via openUploadStream can be timed out") - @Test + @FlakyTest(maxAttempts = 3) public void testGridFSUploadViaOpenUploadStreamTimeout() { assumeTrue(serverVersionAtLeast(4, 4)); long rtt = ClusterFixture.getPrimaryRTT(); @@ -461,7 +461,7 @@ public void test8ServerSelectionHandshake(final String ignoredTestName, final in @SuppressWarnings("try") @DisplayName("9. End Session. The timeout specified via the MongoClient timeoutMS option") - @Test + @FlakyTest(maxAttempts = 3) public void test9EndSessionClientTimeout() { assumeTrue(serverVersionAtLeast(4, 4)); assumeFalse(isStandalone()); From e6d111a620d1c87f837afb56bb09a68e3dd05122 Mon Sep 17 00:00:00 2001 From: Maxim Katcharov Date: Thu, 14 Nov 2024 14:53:51 -0700 Subject: [PATCH 2/2] Revert --- .../AbstractClientSideEncryptionDecryptionEventsTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java index 63709cc4cbf..2271f14ae86 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionDecryptionEventsTest.java @@ -30,7 +30,6 @@ import com.mongodb.event.CommandSucceededEvent; import com.mongodb.fixture.EncryptionFixture; import com.mongodb.internal.connection.TestCommandListener; -import com.mongodb.test.FlakyTest; import org.bson.BsonBinary; import org.bson.BsonDocument; import org.bson.BsonString; @@ -175,7 +174,7 @@ public void networkError() { assertDoesNotThrow(() -> commandListener.getCommandFailedEvent("aggregate")); } - @FlakyTest(maxAttempts = 3) + @Test public void decryptError() { MongoCollection decryptionEvents = encryptedClient .getDatabase(getDefaultDatabaseName())