Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CustomEndpointTest initialization #1163

Merged
merged 4 commits into from
Oct 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -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<String, DBClusterEndpoint> endpoints = new HashMap<String, DBClusterEndpoint>() {{
put(oneInstanceEndpointId, null);
put(twoInstanceEndpointId, null);
Expand All @@ -103,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<TestInstanceInfo> instances = envInfo.getDatabaseInfo().getInstances();
createEndpoint(client, clusterId, oneInstanceEndpointId, instances.subList(0, 1));
createEndpoint(client, clusterId, twoInstanceEndpointId, instances.subList(0, 2));
Expand Down
Loading