enable on min two instances

Bit-Quill · Feb 29, 2024 · 4a39e92 · 4a39e92
1 parent 2fb65e1
commit 4a39e92
Showing 1 changed file with 4 additions and 27 deletions.
diff --git a/wrapper/src/test/java/integration/container/tests/TopologyQueryTests.java b/wrapper/src/test/java/integration/container/tests/TopologyQueryTests.java
@@ -29,6 +29,7 @@
 import integration.container.TestEnvironment;
 import integration.container.condition.DisableOnTestFeature;
 import integration.container.condition.EnableOnDatabaseEngineDeployment;
+import integration.container.condition.EnableOnNumOfInstances;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -69,14 +70,6 @@ public class TopologyQueryTests {
   public void auroraTestTypes(TestDriver testDriver) throws SQLException {
     LOGGER.info(testDriver.toString());
     List<String> expectedTypes;
-    // Topology queries fail on docker containers, can't test topology for them
-    // Also skip RDS, this is for Aurora
-//     if (TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngineDeployment()
-//         == DatabaseEngineDeployment.DOCKER
-//         || TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngineDeployment()
-//         == DatabaseEngineDeployment.RDS) {
-//       return;
-//     }
 
     final Properties props = ConnectionStringHelper.getDefaultPropertiesWithNoPlugins();
     DriverHelper.setConnectTimeout(testDriver, props, 10, TimeUnit.SECONDS);
@@ -138,18 +131,10 @@ public void auroraTestTypes(TestDriver testDriver) throws SQLException {
   @TestTemplate
   @ExtendWith(TestDriverProvider.class)
   @EnableOnDatabaseEngineDeployment(DatabaseEngineDeployment.AURORA)
+  @EnableOnNumOfInstances(min = 2)
   public void auroraTestTimestamp(TestDriver testDriver) throws SQLException, ParseException {
     LOGGER.info(testDriver.toString());
 
-    // Topology queries fail on docker containers, can't test topology for them
-    // Also skip RDS, this is for Aurora
-//     if (TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngineDeployment()
-//         == DatabaseEngineDeployment.DOCKER
-//         || TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngineDeployment()
-//         == DatabaseEngineDeployment.RDS) {
-//       return;
-//     }
-
     final Properties props = ConnectionStringHelper.getDefaultPropertiesWithNoPlugins();
     DriverHelper.setConnectTimeout(testDriver, props, 10, TimeUnit.SECONDS);
     DriverHelper.setSocketTimeout(testDriver, props, 10, TimeUnit.SECONDS);
@@ -161,13 +146,13 @@ public void auroraTestTimestamp(TestDriver testDriver) throws SQLException, Pars
                 .getInfo()
                 .getDatabaseInfo()
                 .getInstances()
-                .get(0)
+                .get(1)
                 .getHost(),
             TestEnvironment.getCurrent()
                 .getInfo()
                 .getDatabaseInfo()
                 .getInstances()
-                .get(0)
+                .get(1)
                 .getPort(),
             TestEnvironment.getCurrent().getInfo().getDatabaseInfo().getDefaultDbName());
     LOGGER.finest("Connecting to " + url);
@@ -206,14 +191,6 @@ public void auroraTestTimestamp(TestDriver testDriver) throws SQLException, Pars
   public void rdsTestTypes(TestDriver testDriver) throws SQLException {
     LOGGER.info(testDriver.toString());
 
-    // Topology queries fail on docker containers, can't test topology for them
-//     if (TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngineDeployment()
-//         == DatabaseEngineDeployment.DOCKER
-//         || TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngineDeployment()
-//         == DatabaseEngineDeployment.AURORA) {
-//       return;
-//     }
-
     final Properties props = ConnectionStringHelper.getDefaultPropertiesWithNoPlugins();
     DriverHelper.setConnectTimeout(testDriver, props, 10, TimeUnit.SECONDS);
     DriverHelper.setSocketTimeout(testDriver, props, 10, TimeUnit.SECONDS);