{misc] ensure better test stability for appveyor

mariadb-corporation · Mar 9, 2018 · 7fb4cf0 · 7fb4cf0
1 parent 2855617
commit 7fb4cf0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
@@ -53,9 +53,9 @@
 package org.mariadb.jdbc.internal.util.constant;
 
 public final class Version {
-    public static final String version = "2.2.3-SNAPSHOT";
+    public static final String version = "2.2.3";
     public static final int majorVersion = 2;
     public static final int minorVersion = 2;
     public static final int patchVersion = 3;
-    public static final String qualifier = "-SNAPSHOT";
+    public static final String qualifier = "";
 }
diff --git a/src/test/java/org/mariadb/jdbc/ConnectionTest.java b/src/test/java/org/mariadb/jdbc/ConnectionTest.java
@@ -563,13 +563,13 @@ public void loopSleepTest() throws Exception {
         initializeDns("host1.555-rds.amazonaws.com");
 
         //failover
-        checkConnection("jdbc:mariadb:failover://host1,host2/testj?user=root&retriesAllDown=20&connectTimeout=200", 2000, 3200);
+        checkConnection("jdbc:mariadb:failover://host1,host2/testj?user=root&retriesAllDown=20&connectTimeout=20", 2000, 3200);
         //replication
-        checkConnection("jdbc:mariadb:replication://host1,host2/testj?user=root&retriesAllDown=20&connectTimeout=200", 2000, 3200);
+        checkConnection("jdbc:mariadb:replication://host1,host2/testj?user=root&retriesAllDown=20&connectTimeout=20", 2000, 3200);
         //aurora - no cluster end point
-        checkConnection("jdbc:mariadb:aurora://host1,host2/testj?user=root&retriesAllDown=20&connectTimeout=200", 2000, 3200);
+        checkConnection("jdbc:mariadb:aurora://host1,host2/testj?user=root&retriesAllDown=20&connectTimeout=20", 2000, 3200);
         //aurora - using cluster end point
-        checkConnection("jdbc:mariadb:aurora://host1.555-rds.amazonaws.com/testj?user=root&retriesAllDown=20&connectTimeout=200", 4500, 10000);
+        checkConnection("jdbc:mariadb:aurora://host1.555-rds.amazonaws.com/testj?user=root&retriesAllDown=20&connectTimeout=20", 4500, 10000);
 
     }
 

diff --git a/src/test/java/org/mariadb/jdbc/TimeoutTest.java b/src/test/java/org/mariadb/jdbc/TimeoutTest.java
@@ -118,14 +118,14 @@ public void resultSetAfterSocketTimeoutTest() {
     public void socketTimeoutTest() throws SQLException {
         Assume.assumeFalse(sharedIsAurora());
         // set a short connection timeout
-        try (Connection connection = setConnection("&connectTimeout=500&socketTimeout=500")) {
+        try (Connection connection = setConnection("&connectTimeout=1000&socketTimeout=1000")) {
             PreparedStatement ps = connection.prepareStatement("SELECT 1");
             ResultSet rs = ps.executeQuery();
             assertTrue(rs.next());
             logInfo(rs. getString(1));
 
             // wait for the connection to time out
-            ps = connection.prepareStatement("SELECT sleep(1)");
+            ps = connection.prepareStatement("SELECT sleep(2)");
 
             // a timeout should occur here
             try {