diff options
| author | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2017-09-07 18:01:12 +0000 |
|---|---|---|
| committer | Paul Rogers <progers@maprtech.com> | 2017-09-24 22:21:20 -0700 |
| commit | 9620e34829a25d767f90b272b9b57ccc9e0e36ea (patch) | |
| tree | 0a7537c58d5566b19494c7ba03875c65d0b2cf75 /contrib/storage-hbase/src | |
| parent | 6cb626d78de75a1061e1381f680478ed8844123a (diff) | |
DRILL-5781: Fix unit test failures to use tests config even if default config is available
closes #942
Diffstat (limited to 'contrib/storage-hbase/src')
| -rw-r--r-- | contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseTestsSuite.java | 5 | ||||
| -rw-r--r-- | contrib/storage-hbase/src/test/resources/hbase-site.xml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseTestsSuite.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseTestsSuite.java index 3dd36081d..1a176ca3b 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseTestsSuite.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseTestsSuite.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -21,6 +21,7 @@ import java.io.IOException; import java.lang.management.ManagementFactory; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.drill.exec.ZookeeperTestUtil; import org.apache.drill.exec.util.GuavaPatcher; import org.apache.drill.hbase.test.Drill2130StorageHBaseHamcrestConfigurationTest; import org.apache.hadoop.conf.Configuration; @@ -95,6 +96,8 @@ public class HBaseTestsSuite { @BeforeClass public static void initCluster() throws Exception { + ZookeeperTestUtil.setJaasTestConfigFile(); + if (initCount.get() == 0) { synchronized (HBaseTestsSuite.class) { if (initCount.get() == 0) { diff --git a/contrib/storage-hbase/src/test/resources/hbase-site.xml b/contrib/storage-hbase/src/test/resources/hbase-site.xml index 54425d440..f5c0fcbf7 100644 --- a/contrib/storage-hbase/src/test/resources/hbase-site.xml +++ b/contrib/storage-hbase/src/test/resources/hbase-site.xml @@ -66,15 +66,13 @@ Default is 10. </description> </property> -<!-- - <property> + <property> <name>hbase.master.info.port</name> <value>-1</value> <description>The port for the hbase master web UI Set to -1 if you do not want the info server to run. </description> </property> ---> <property> <name>hbase.regionserver.info.port</name> <value>-1</value> |