Merge pull request #198 from v-suhame/connectionResiliency

skip connectionResiliency in test that checks for timeout
microsoft · Mar 13, 2017 · de50fde · de50fde
2 parents 52e638c + cf793a3
commit de50fde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
@@ -109,6 +109,8 @@ public void testQueryTimeout() throws Exception {
 
     @Test
     public void testSocketTimeout() throws Exception {
+        // cancel connection resilience to test socketTimeout
+        connectionString += "connectRetryCount=0";
         SQLServerConnection conn = (SQLServerConnection) DriverManager.getConnection(connectionString);
 
         dropWaitForDelayProcedure(conn);

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecuteWithErrorsTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecuteWithErrorsTest.java
@@ -273,6 +273,10 @@ public void Repro47239() throws SQLException {
     public void Repro47239_large() throws Exception {
 
         assumeTrue("JDBC42".equals(Utils.getConfiguredProperty("JDBC_Version")), "Aborting test case as JDBC version is not compatible. ");
+
+        // cancel connection resilience to test
+        connectionString += "connectRetryCount=0";
+
         // the DBConnection for detecting whether the server is SQL Azure or SQL Server.
         con = DriverManager.getConnection(connectionString);
         final String warning;