From 76ea138131560a8860ad8bc19ec7835bd98e5b94 Mon Sep 17 00:00:00 2001 From: aaron-congo Date: Tue, 22 Oct 2024 15:47:22 -0700 Subject: [PATCH 1/3] Fix CustomEndpointTest initialization --- .../integration/container/tests/CustomEndpointTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java b/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java index caf5aef19..adb3d0d45 100644 --- a/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java +++ b/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java @@ -46,6 +46,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -69,7 +70,7 @@ @TestMethodOrder(MethodOrderer.MethodName.class) @ExtendWith(TestDriverProvider.class) -@EnableOnDatabaseEngineDeployment({DatabaseEngineDeployment.AURORA, DatabaseEngineDeployment.RDS_MULTI_AZ_CLUSTER}) +@EnableOnDatabaseEngineDeployment({DatabaseEngineDeployment.AURORA}) @DisableOnTestFeature({ TestEnvironmentFeatures.PERFORMANCE, TestEnvironmentFeatures.RUN_HIBERNATE_TESTS_ONLY, @@ -79,8 +80,8 @@ @Order(16) public class CustomEndpointTest { private static final Logger LOGGER = Logger.getLogger(CustomEndpointTest.class.getName()); - protected static final String oneInstanceEndpointId = "test-endpoint-1"; - protected static final String twoInstanceEndpointId = "test-endpoint-2"; + protected static final String oneInstanceEndpointId = "test-endpoint-1" + UUID.randomUUID(); + protected static final String twoInstanceEndpointId = "test-endpoint-2" + UUID.randomUUID(); protected static final Map endpoints = new HashMap() {{ put(oneInstanceEndpointId, null); put(twoInstanceEndpointId, null); From 7fe13061cb5e32cb18df92a680d936c2d9a59f4d Mon Sep 17 00:00:00 2001 From: aaron-congo Date: Tue, 22 Oct 2024 15:55:52 -0700 Subject: [PATCH 2/3] Skip delete endpoints at test initialization since endpoints should be unique --- .../java/integration/container/tests/CustomEndpointTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java b/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java index adb3d0d45..0a1c08e60 100644 --- a/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java +++ b/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java @@ -104,9 +104,6 @@ public static void createEndpoints() { return; } - // Delete pre-existing custom endpoints in case they weren't cleaned up in a previous run. - deleteEndpoints(client); - List instances = envInfo.getDatabaseInfo().getInstances(); createEndpoint(client, clusterId, oneInstanceEndpointId, instances.subList(0, 1)); createEndpoint(client, clusterId, twoInstanceEndpointId, instances.subList(0, 2)); From ae6ffbcd123d4c84a295d6f2b76572d5b4f9ebb6 Mon Sep 17 00:00:00 2001 From: aaron-congo Date: Tue, 22 Oct 2024 16:07:08 -0700 Subject: [PATCH 3/3] Add dash to custom endpoint IDs for clarity --- .../java/integration/container/tests/CustomEndpointTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java b/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java index 0a1c08e60..f58e023aa 100644 --- a/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java +++ b/wrapper/src/test/java/integration/container/tests/CustomEndpointTest.java @@ -80,8 +80,8 @@ @Order(16) public class CustomEndpointTest { private static final Logger LOGGER = Logger.getLogger(CustomEndpointTest.class.getName()); - protected static final String oneInstanceEndpointId = "test-endpoint-1" + UUID.randomUUID(); - protected static final String twoInstanceEndpointId = "test-endpoint-2" + UUID.randomUUID(); + protected static final String oneInstanceEndpointId = "test-endpoint-1-" + UUID.randomUUID(); + protected static final String twoInstanceEndpointId = "test-endpoint-2-" + UUID.randomUUID(); protected static final Map endpoints = new HashMap() {{ put(oneInstanceEndpointId, null); put(twoInstanceEndpointId, null);