Skip to content

Commit 80665f6

Browse files
author
diego Dupin
committed
[misc] ensure skysql test reliability
1 parent 8467bb0 commit 80665f6

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- if: type = push AND fork = false
6262
env: srv=mysql v=5.7
6363
- if: type = push AND fork = false
64-
env: srv=mysql v=8.0
64+
env: srv=mysql v=8.0 TEST_DB_OTHER=allowPublicKeyRetrieval
6565
- if: type = push AND fork = false
6666
env: srv=skysql
6767
- if: type = push AND fork = false

src/test/java/org/mariadb/jdbc/ConnectionTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,9 @@ public void connectionUnexpectedClose() throws SQLException {
817817
@Test
818818
public void ensureSocketTimeoutState() throws Throwable {
819819
Assume.assumeTrue(
820-
!"maxscale".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
820+
!"maxscale".equals(System.getenv("srv"))
821+
&& !"skysql-ha".equals(System.getenv("srv"))
822+
&& !"skysql".equals(System.getenv("srv")));
821823

822824
Statement stmt = sharedConnection.createStatement();
823825
stmt.execute("DROP TABLE IF EXISTS ensureSocketTimeoutState");

src/test/java/org/mariadb/jdbc/DatatypeCompatibilityTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ private void assertType(
234234
String columnName =
235235
columnType.replace(" ", "_").replace("(", "_").replace(")", "").replace(",", "_");
236236
try (Statement stmt = sharedConnection.createStatement()) {
237+
stmt.execute("DROP TABLE IF EXISTS my_table_" + columnName);
237238
stmt.execute("CREATE TABLE my_table_" + columnName + "(my_col " + columnType + ")");
238239
stmt.execute("FLUSH TABLES");
239240
stmt.execute("INSERT INTO my_table_" + columnName + "(my_col) VALUES (" + strValue + ")");

src/test/java/org/mariadb/jdbc/DriverTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,6 +1705,8 @@ public void testRollbackOnClose() throws SQLException {
17051705

17061706
@Test
17071707
public void testAutoCommit() throws SQLException {
1708+
Assume.assumeTrue(
1709+
!"maxscale".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
17081710
try (Connection connection = setConnection()) {
17091711
assertTrue(connection.getAutoCommit());
17101712
Statement stmt = connection.createStatement();

0 commit comments

Comments
 (0)