phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject [24/50] git commit: fix unit test failures due to recent hbase 98/trunk code changes
Date Mon, 10 Mar 2014 06:20:41 GMT
fix unit test failures due to recent hbase 98/trunk code changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/13d112a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/13d112a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/13d112a9

Branch: refs/heads/master
Commit: 13d112a9635b4d9373356991716e4f7dec0d0dcb
Parents: 0eab977
Author: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Authored: Mon Mar 3 12:18:36 2014 -0800
Committer: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Committed: Mon Mar 3 12:18:36 2014 -0800

----------------------------------------------------------------------
 .../phoenix/end2end/ConnectionQueryServicesTestImpl.java       | 6 ++----
 .../org/apache/phoenix/end2end/QueryDatabaseMetaDataTest.java  | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/13d112a9/phoenix-core/src/test/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
b/phoenix-core/src/test/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
index 96a2675..69b8752 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
@@ -20,16 +20,12 @@
 package org.apache.phoenix.end2end;
 
 import java.sql.SQLException;
-import java.util.List;
 import java.util.Properties;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
-
 import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo;
 import org.apache.phoenix.query.ConnectionQueryServicesImpl;
 import org.apache.phoenix.query.QueryServices;
@@ -84,6 +80,8 @@ public class ConnectionQueryServicesTestImpl extends ConnectionQueryServicesImpl
     @Override
     public void init(String url, Properties props) throws SQLException {
         try {
+            // during test, we don't do hbase.table.sanity.checks
+            config.setBoolean("hbase.table.sanity.checks", false);
             setupServer(config);
             super.init(url, props);
             /**

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/13d112a9/phoenix-core/src/test/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataTest.java
index 56e3d86..e0486a3 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataTest.java
@@ -642,7 +642,10 @@ public class QueryDatabaseMetaDataTest extends BaseClientManagedTimeTest
{
             fail();
         } catch (TableNotFoundException e) {
             // expected to fail b/c table doesn't exist
+        } catch (ReadOnlyTableException e) {
+          // expected to fail b/c table doesn't exist
         }
+        
         createStmt = "create view " + MDTEST_NAME + 
                 "   (id char(1) not null primary key,\n" + 
                 "    a.col1 integer,\n" +


Mime
View raw message