diff --git hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java index beb4fe9f4b..cec17a4a14 100644 --- hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java +++ hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java @@ -287,12 +287,8 @@ private void enableTestOnlyCmd(HiveConf conf){ } private String getKeyProviderURI() { - // Use the target directory if it is not specified - String HIVE_ROOT = ensurePathEndsInSlash(System.getProperty("hive.root")); - String keyDir = HIVE_ROOT + "ql/target/"; - // put the jks file in the current test path only for test purpose - return "jceks://file" + new Path(keyDir, "test.jks").toUri(); + return "jceks://file" + new Path(ensurePathEndsInSlash(TEST_DATA_DIR), "test.jks").toUri(); } @Test diff --git service/src/test/org/apache/hive/service/cli/session/TestSessionManagerMetrics.java service/src/test/org/apache/hive/service/cli/session/TestSessionManagerMetrics.java index 2eb07eee28..d78ce699a6 100644 --- service/src/test/org/apache/hive/service/cli/session/TestSessionManagerMetrics.java +++ service/src/test/org/apache/hive/service/cli/session/TestSessionManagerMetrics.java @@ -45,6 +45,7 @@ import org.apache.hive.service.cli.operation.OperationManager; import org.apache.hive.service.rpc.thrift.TProtocolVersion; import org.apache.hive.service.server.HiveServer2; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -92,6 +93,12 @@ public void setup() throws Exception { Hive.set(doNothingHive); } + @After + public void tearDown() throws Exception { + MetricsFactory.close(); + sm.stop(); + } + class BarrierRunnable implements Runnable { private final CyclicBarrier ready;