[misc] ensure skysql test reliability

mariadb-corporation · Jan 21, 2022 · 80665f6 · 80665f6
1 parent 8467bb0
commit 80665f6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -61,7 +61,7 @@ jobs:
     - if: type = push AND fork = false
       env: srv=mysql v=5.7
     - if: type = push AND fork = false
-      env: srv=mysql v=8.0
+      env: srv=mysql v=8.0 TEST_DB_OTHER=allowPublicKeyRetrieval
     - if: type = push AND fork = false
       env: srv=skysql
     - if: type = push AND fork = false

diff --git a/src/test/java/org/mariadb/jdbc/ConnectionTest.java b/src/test/java/org/mariadb/jdbc/ConnectionTest.java
@@ -817,7 +817,9 @@ public void connectionUnexpectedClose() throws SQLException {
   @Test
   public void ensureSocketTimeoutState() throws Throwable {
     Assume.assumeTrue(
-        !"maxscale".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
+        !"maxscale".equals(System.getenv("srv"))
+            && !"skysql-ha".equals(System.getenv("srv"))
+            && !"skysql".equals(System.getenv("srv")));
 
     Statement stmt = sharedConnection.createStatement();
     stmt.execute("DROP TABLE IF EXISTS ensureSocketTimeoutState");

diff --git a/src/test/java/org/mariadb/jdbc/DatatypeCompatibilityTest.java b/src/test/java/org/mariadb/jdbc/DatatypeCompatibilityTest.java
@@ -234,6 +234,7 @@ private void assertType(
     String columnName =
         columnType.replace(" ", "_").replace("(", "_").replace(")", "").replace(",", "_");
     try (Statement stmt = sharedConnection.createStatement()) {
+      stmt.execute("DROP TABLE IF EXISTS my_table_" + columnName);
       stmt.execute("CREATE TABLE my_table_" + columnName + "(my_col " + columnType + ")");
       stmt.execute("FLUSH TABLES");
       stmt.execute("INSERT INTO my_table_" + columnName + "(my_col) VALUES (" + strValue + ")");

diff --git a/src/test/java/org/mariadb/jdbc/DriverTest.java b/src/test/java/org/mariadb/jdbc/DriverTest.java
@@ -1705,6 +1705,8 @@ public void testRollbackOnClose() throws SQLException {
 
   @Test
   public void testAutoCommit() throws SQLException {
+    Assume.assumeTrue(
+        !"maxscale".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
     try (Connection connection = setConnection()) {
       assertTrue(connection.getAutoCommit());
       Statement stmt = connection.createStatement();