You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/04/26 01:44:48 UTC
[2/9] incubator-calcite git commit: Disable tests that fail under JDK
1.7 due to [CALCITE-687]
Disable tests that fail under JDK 1.7 due to [CALCITE-687]
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/948e4567
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/948e4567
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/948e4567
Branch: refs/heads/master
Commit: 948e45671d04f720a71b79f022e143aa480164d4
Parents: cecce5e
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Apr 21 10:55:12 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed Apr 22 15:37:52 2015 -0700
----------------------------------------------------------------------
.../org/apache/calcite/avatica/RemoteDriverTest.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/948e4567/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java b/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
index 204f0fa..3fbd8a7 100644
--- a/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
+++ b/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
@@ -71,6 +71,10 @@ public class RemoteDriverTest {
private static final ConnectionSpec CONNECTION_SPEC = ConnectionSpec.HSQLDB;
+ // see [CALCITE-687] Make RemoteDriverTest.testStatementLifecycle thread-safe
+ private static final boolean JDK17 =
+ System.getProperty("java.version").startsWith("1.7");
+
private Connection mjs() throws SQLException {
return DriverManager.getConnection("jdbc:avatica:remote:factory=" + MJS);
}
@@ -151,6 +155,9 @@ public class RemoteDriverTest {
}
@Test public void testStatementExecuteQueryLocal() throws Exception {
+ if (JDK17) {
+ return;
+ }
checkStatementExecuteQuery(ljs(), false);
}
@@ -475,10 +482,8 @@ public class RemoteDriverTest {
}
}
+ @Ignore("[CALCITE-687] Make RemoteDriverTest.testStatementLifecycle thread-safe")
@Test public void testConnectionIsolation() throws Exception {
- // Wait 5s for all other tests to finish. (Sorry! Hack!)
- Thread.sleep(5000);
-
final String sql = "select * from (values (1, 'a'))";
Connection conn1 = ljs();
Connection conn2 = ljs();
@@ -508,6 +513,9 @@ public class RemoteDriverTest {
}
@Test public void testPrepareBindExecuteFetch() throws Exception {
+ if (JDK17) {
+ return;
+ }
checkPrepareBindExecuteFetch(ljs());
}