Repository: hive Updated Branches: refs/heads/master d703c2221 -> 1253a8db4
HIVE-10747: Enable the cleanup of side effect for the Encryption related qfile test (Ferdinand Xu, reviewed by Sergio Pena) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1253a8db Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1253a8db Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1253a8db Branch: refs/heads/master Commit: 1253a8db49a313edb325731379b8d15effd2ff01 Parents: d703c22 Author: Sergio Pena <sergio.p...@cloudera.com> Authored: Wed May 20 10:03:01 2015 -0500 Committer: Sergio Pena <sergio.p...@cloudera.com> Committed: Wed May 20 10:03:01 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/ql/QTestUtil.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1253a8db/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java ---------------------------------------------------------------------- diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java index f357c14..2b4bd85 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java @@ -733,14 +733,12 @@ public class QTestUtil { clearTablesCreatedDuringTests(); clearKeysCreatedInTests(); - if (clusterType != MiniClusterType.encrypted) { - // allocate and initialize a new conf since a test can - // modify conf by using 'set' commands - conf = new HiveConf (Driver.class); - initConf(); - // renew the metastore since the cluster type is unencrypted - db = Hive.get(conf); // propagate new conf to meta store - } + // allocate and initialize a new conf since a test can + // modify conf by using 'set' commands + conf = new HiveConf(Driver.class); + initConf(); + // renew the metastore since the cluster type is unencrypted + db = Hive.get(conf); // propagate new conf to meta store setup.preTest(conf); }