[misc] testing correction when testSingleHost is false

mariadb-corporation · Jun 18, 2018 · 7db9cbb · 7db9cbb
1 parent 8a4877e
commit 7db9cbb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/test/java/org/mariadb/jdbc/BaseTest.java b/src/test/java/org/mariadb/jdbc/BaseTest.java
@@ -368,9 +368,12 @@ public static void createFunction(String name, String body) throws SQLException
      * @throws SQLException if any error occur
      */
     public boolean anonymousUser() throws SQLException {
-        Statement stmt = sharedConnection.createStatement();
-        ResultSet rs = stmt.executeQuery("SELECT * FROM mysql.user u where u.Host='localhost' and u.User=''");
-        return rs.next();
+        if (testSingleHost) {
+            Statement stmt = sharedConnection.createStatement();
+            ResultSet rs = stmt.executeQuery("SELECT * FROM mysql.user u where u.Host='localhost' and u.User=''");
+            return rs.next();
+        }
+        return false;
     }
 
     /**
@@ -380,8 +383,11 @@ public boolean anonymousUser() throws SQLException {
      * @throws SQLException exception
      */
     static boolean isMariadbServer() throws SQLException {
-        DatabaseMetaData md = sharedConnection.getMetaData();
-        return md.getDatabaseProductVersion().contains("MariaDB");
+        if (testSingleHost) {
+            DatabaseMetaData md = sharedConnection.getMetaData();
+            return md.getDatabaseProductVersion().contains("MariaDB");
+        }
+        return false;
     }
 
     /**

diff --git a/src/test/java/org/mariadb/jdbc/failover/AllowMasterDownTest.java b/src/test/java/org/mariadb/jdbc/failover/AllowMasterDownTest.java
@@ -53,10 +53,10 @@
 package org.mariadb.jdbc.failover;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.mariadb.jdbc.BaseTest;
-import org.mariadb.jdbc.internal.util.constant.HaMode;
 
 import java.sql.*;
 
@@ -72,15 +72,19 @@ public class AllowMasterDownTest extends BaseTest {
      */
     @Before
     public void init() {
-        masterDownUrl = "jdbc:mariadb:replication//" + hostname + ":9999"
-                + "," + hostname + ((port == 0) ? "" : ":" + port)
-                + "/" + database + "?user=" + username
-                + ((password != null) ? "&password=" + password : "")
-                + "&retriesAllDown=10&allowMasterDownConnection";
+        Assume.assumeTrue(testSingleHost);
+        if (testSingleHost) {
+            masterDownUrl = "jdbc:mariadb:replication//" + hostname + ":9999"
+                    + "," + hostname + ((port == 0) ? "" : ":" + port)
+                    + "/" + database + "?user=" + username
+                    + ((password != null) ? "&password=" + password : "")
+                    + "&retriesAllDown=10&allowMasterDownConnection";
+        }
     }
 
     @Test
     public void masterDownReadOnlyAvailable() throws SQLException {
+
         try (Connection connection = DriverManager.getConnection(masterDownUrl)) {
             Assert.assertFalse(connection.isReadOnly());
             connection.isValid(0);