drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From par...@apache.org
Subject [1/9] drill git commit: DRILL-2651: Increase JDBC tests' timeout time.
Date Tue, 07 Apr 2015 02:14:55 GMT
Repository: drill
Updated Branches:
  refs/heads/master af7a52bee -> f066786e4


DRILL-2651: Increase JDBC tests' timeout time.

Added overriding timeout rule for test that have been timing out increasingly:
- TestJdbcMetadata
- Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/efdad4cb
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/efdad4cb
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/efdad4cb

Branch: refs/heads/master
Commit: efdad4cba09c51a60d75b0005ae2b7e83d84b98b
Parents: 31c9867
Author: dbarclay <dbarclay@maprtech.com>
Authored: Wed Apr 1 01:06:17 2015 -0700
Committer: Parth Chandra <pchandra@maprtech.com>
Committed: Mon Apr 6 18:24:05 2015 -0700

----------------------------------------------------------------------
 .../Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java   | 6 ++++++
 .../java/org/apache/drill/jdbc/test/TestJdbcMetadata.java    | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/efdad4cb/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
index faca543..3dd3421 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
@@ -23,7 +23,9 @@ import static org.hamcrest.CoreMatchers.*;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestRule;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -31,6 +33,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
+import org.apache.drill.common.util.TestTools;
 import org.apache.drill.jdbc.JdbcTest;
 
 
@@ -43,6 +46,9 @@ public class Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest extends JdbcTest
   private static Connection connection;
   private static DatabaseMetaData dbMetadata;
 
+  @Rule
+  public TestRule TIMEOUT = TestTools.getTimeoutRule( 90_000 /* ms */ );
+
   @BeforeClass
   public static void setUpConnection() throws Exception {
     connection = connect( "jdbc:drill:zk=local" );

http://git-wip-us.apache.org/repos/asf/drill/blob/efdad4cb/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
index 24372a7..8c6604a 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
@@ -21,13 +21,19 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.drill.common.util.TestTools;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestRule;
 
 
 public class TestJdbcMetadata extends JdbcTestActionBase {
-  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcMetadata.class);
+  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcMetadata.class);
 
 
+  @Rule
+  public TestRule TIMEOUT = TestTools.getTimeoutRule( 90_000 /* ms */ );
+
   @Test
   public void catalogs() throws Exception{
     this.testAction(new JdbcAction(){


Mime
View raw message