[kylin] branch master updated: KYLIN-4089 Fix integration test failed with JDBC metastore

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new 32044d9  KYLIN-4089 Fix integration test failed with JDBC metastore
32044d9 is described below

commit 32044d9522b881ae1b4723667695c9c01ea342aa
Author: chao long <wa...@qq.com>
AuthorDate: Wed Jul 17 15:51:11 2019 +0800

    KYLIN-4089 Fix integration test failed with JDBC metastore
---
 .../apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java
index 89c31ec..9e602ba 100644
--- a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java
@@ -47,6 +47,7 @@ import org.apache.kylin.rest.service.AclTableMigrationTool;
 import org.apache.kylin.rest.service.KylinUserService;
 import org.apache.kylin.rest.util.Serializer;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -78,10 +79,10 @@ public class ITAclTableMigrationToolTest extends HBaseMetadataTestCase {
     public void setup() throws Exception {
         this.createTestMetadata();
         kylinConfig = KylinConfig.getInstanceFromEnv();
-        if (!(ResourceStore.getStore(kylinConfig) instanceof HBaseResourceStore)) {
-            logger.info("HBase Enviroment not found. Ignore this test");
-            return;
-        }
+
+        // if not HBaseResourceStore, the following tests will be skipped
+        Assume.assumeTrue((ResourceStore.getStore(kylinConfig) instanceof HBaseResourceStore));
+
         cleanUpAll();
         createTestHTables();
         addRecordsToTable();