[misc] test correction

Author: rusher

src/test/java/org/mariadb/jdbc/integration/ConfigurationTest.java

@@ -7,10 +7,8 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.sql.*;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+
+import org.junit.jupiter.api.*;
 
 public class ConfigurationTest extends Common {
 
@@ -59,12 +57,24 @@ public void testSessionVariable() throws SQLException {
  Statement stmt = connection.createStatement();
  ResultSet rs = stmt.executeQuery("SELECT @@session_track_system_variables");
  assertTrue(rs.next());
+ } catch (SQLException e) {
+ // in case server check variable validity
+ Assertions.assertTrue(e.getCause().getMessage().contains("Unknown system variable 'some';f'"));
  }
  try (Connection connection =
  createCon("sessionVariables=session_track_system_variables=\"some\\\";f,'ff'\"")) {
  Statement stmt = connection.createStatement();
  ResultSet rs = stmt.executeQuery("SELECT @@session_track_system_variables");
  assertTrue(rs.next());
+ } catch (SQLException e) {
+ // in case server check variable validity
+ Assertions.assertTrue(e.getCause().getMessage().contains("Unknown system variable 'some\";f'"));
+ }
+ try (Connection connection =
+ createCon("sessionVariables=session_track_system_variables=connect_timeout")) {
+ Statement stmt = connection.createStatement();
+ ResultSet rs = stmt.executeQuery("SELECT @@session_track_system_variables");
+ assertTrue(rs.next());
  }
  }
  }

src/test/java/org/mariadb/jdbc/integration/MultiHostTest.java

@@ -275,7 +275,7 @@ public void masterFailover() throws Exception {
  (Connection)
  DriverManager.getConnection(
  url
- + "&waitReconnectTimeout=300&retriesAllDown=10&connectTimeout=20&deniedListTimeout=20")) {
+ + "&waitReconnectTimeout=300&retriesAllDown=10&connectTimeout=20&deniedListTimeout=20&socketTimeout=10")) {
  Statement stmt = con.createStatement();
  stmt.execute("START TRANSACTION");
  stmt.execute("SET @con=1");