SNOW-799391: Check only http connection timeout

snowflakedb · Oct 22, 2024 · d0b16be · d0b16be
1 parent 46e3b56
commit d0b16be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java
@@ -72,6 +72,7 @@
 import net.snowflake.common.core.SqlState;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.entity.StringEntity;
 import org.junit.After;
 import org.junit.Before;
@@ -1634,8 +1635,7 @@ public void shouldFailOnSslExceptionWithLinkToTroubleShootingGuide() throws Inte
       fail("should fail");
     } catch (SQLException e) {
       // *.badssl.com may fail with timeout
-      if (!(e.getCause() instanceof SSLHandshakeException)
-          && e.getCause().getMessage().toLowerCase().contains("timeout")) {
+      if (e.getCause() instanceof ConnectTimeoutException) {
         return;
       }
       assertThat(e.getCause(), instanceOf(SSLHandshakeException.class));

diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java
@@ -24,6 +24,7 @@
 import net.snowflake.client.category.TestCategoryConnection;
 import net.snowflake.client.core.SFOCSPException;
 import net.snowflake.client.core.SFTrustManager;
+import org.apache.http.conn.ConnectTimeoutException;
 import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Before;
@@ -419,9 +420,7 @@ public void testWrongHost() throws InterruptedException {
       fail("should fail");
     } catch (SQLException ex) {
       // *.badssl.com may fail with timeout
-      if (!(ex.getCause() instanceof SSLPeerUnverifiedException)
-          && !(ex.getCause() instanceof SSLHandshakeException)
-          && ex.getCause().getMessage().toLowerCase().contains("timeout")) {
+      if (ex.getCause() instanceof ConnectTimeoutException) {
         return;
       }
       assertThat(ex, instanceOf(SnowflakeSQLException.class));