Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3557818ABA for ; Sat, 30 May 2015 20:48:45 +0000 (UTC) Received: (qmail 20449 invoked by uid 500); 30 May 2015 20:48:44 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 20398 invoked by uid 500); 30 May 2015 20:48:44 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 20387 invoked by uid 99); 30 May 2015 20:48:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 May 2015 20:48:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F8E6E000D; Sat, 30 May 2015 20:48:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: thejas@apache.org To: commits@hive.apache.org Message-Id: <6e489e3cf0b14e9cb7f0ca9674c5b730@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-10862 : TestHiveAuthorizerShowFilters tests fail when run in sequence (Thejas Nair, reviewed by Gunther Hagleitner) Date: Sat, 30 May 2015 20:48:44 +0000 (UTC) Repository: hive Updated Branches: refs/heads/master 82e797728 -> a4a41830a HIVE-10862 : TestHiveAuthorizerShowFilters tests fail when run in sequence (Thejas Nair, reviewed by Gunther Hagleitner) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/a4a41830 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a4a41830 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a4a41830 Branch: refs/heads/master Commit: a4a41830aa31edc3ad81f93b6c51266b2d542dcb Parents: 82e7977 Author: Thejas Nair Authored: Sat May 30 13:48:37 2015 -0700 Committer: Thejas Nair Committed: Sat May 30 13:48:37 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/TestUtil.java | 41 ++++++++++++++++++++ .../plugin/TestHiveAuthorizerShowFilters.java | 4 ++ 2 files changed, 45 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a4a41830/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java new file mode 100644 index 0000000..304fe5b --- /dev/null +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java @@ -0,0 +1,41 @@ +/** + * 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 + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive; + +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; + +/** + * Test utilities + */ +public class TestUtil { + /** + * Use this if you want a fresh metastore for your test, without any existing entries. + * It updates the configuration to point to new derby dir location + * @param conf HiveConf to be updated + * @param newloc new location within test temp dir for the metastore db + */ + public static void setNewDerbyDbLocation(HiveConf conf, String newloc) { + String newDbLoc = System.getProperty("test.tmp.dir") + newloc + "metastore_db"; + + conf.setVar(ConfVars.METASTORECONNECTURLKEY, "jdbc:derby:;databaseName=" + newDbLoc + + ";create=true"); + } + +} http://git-wip-us.apache.org/repos/asf/hive/blob/a4a41830/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java index d87f74f..266d888 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.apache.hadoop.hive.TestUtil; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.ql.CommandNeedRetryException; @@ -119,6 +120,7 @@ public class TestHiveAuthorizerShowFilters { conf.setBoolVar(ConfVars.HIVE_AUTHORIZATION_ENABLED, true); conf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, false); conf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false); + TestUtil.setNewDerbyDbLocation(conf, TestHiveAuthorizerShowFilters.class.getSimpleName()); SessionState.start(conf); driver = new Driver(conf); @@ -131,6 +133,8 @@ public class TestHiveAuthorizerShowFilters { } + + @Before public void setup() { filterArguments = null;