[misc] test stability improvement

mariadb-corporation · Oct 10, 2023 · 75a21de · 75a21de
1 parent ecf8b24
commit 75a21de
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/test/java/org/mariadb/jdbc/DriverTest.java b/src/test/java/org/mariadb/jdbc/DriverTest.java
@@ -1407,13 +1407,27 @@ public void conj25() throws Exception {
   @Test
   public void namedPipe() {
     try (ResultSet rs =
-        sharedConnection.createStatement().executeQuery("select @@named_pipe,@@socket")) {
+        sharedConnection
+            .createStatement()
+            .executeQuery("select @@named_pipe,@@socket,@@named_pipe_full_access_group")) {
       assertTrue(rs.next());
       if (rs.getBoolean(1)) {
         String namedPipeName = rs.getString(2);
         // skip test if no namedPipeName was obtained because then we do not use a socket connection
         Assume.assumeTrue(namedPipeName != null);
-        try (Connection connection = setConnection("&pipe=" + namedPipeName)) {
+
+        if (!isMariadbServer() && minVersion(8, 0, 14)) {
+          String namedPipeFullAccess = rs.getString(3);
+          System.out.println("namedPipeFullAccess:" + namedPipeFullAccess);
+          Assume.assumeTrue(namedPipeFullAccess != null && !namedPipeFullAccess.isEmpty());
+        }
+        String connUrl =
+            String.format(
+                "jdbc:mariadb:///%s?user=%s&password=%s&%s",
+                database, username, password, defaultOther);
+
+        try (Connection connection =
+            DriverManager.getConnection(connUrl + "&pipe=" + namedPipeName)) {
           Statement stmt = connection.createStatement();
           try (ResultSet rs2 = stmt.executeQuery("SELECT 1")) {
             assertTrue(rs2.next());

diff --git a/src/test/java/org/mariadb/jdbc/GssapiAuthenticationTest.java b/src/test/java/org/mariadb/jdbc/GssapiAuthenticationTest.java
@@ -13,7 +13,7 @@ public class GssapiAuthenticationTest extends BaseTest {
 
   @Test
   public void nativePassword() throws Exception {
-    Assume.assumeTrue(Platform.isWindows());
+    Assume.assumeTrue(Platform.isWindows() && isMariadbServer());
     Statement stmt = sharedConnection.createStatement();
     try {
       stmt.execute("INSTALL SONAME 'auth_gssapi'");