Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 0C2F417DF2 for ; Fri, 20 Mar 2015 00:39:42 +0000 (UTC) Received: (qmail 13996 invoked by uid 500); 20 Mar 2015 00:39:42 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 13901 invoked by uid 500); 20 Mar 2015 00:39:41 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 13875 invoked by uid 99); 20 Mar 2015 00:39:41 -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; Fri, 20 Mar 2015 00:39:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BF0FAE192F; Fri, 20 Mar 2015 00:39:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 20 Mar 2015 00:39:42 -0000 Message-Id: <75e780edb2e4401b8e428db16fecfa3d@git.apache.org> In-Reply-To: <54a065126a7b4d7689244fbe6e6b38af@git.apache.org> References: <54a065126a7b4d7689244fbe6e6b38af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: ACCUMULO-3689 Delete the user if it already exists ACCUMULO-3689 Delete the user if it already exists Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bdedcde8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdedcde8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdedcde8 Branch: refs/heads/master Commit: bdedcde8440d95ca4a89e228f456406f7afaf13f Parents: b43d29a Author: Josh Elser Authored: Thu Mar 19 18:57:12 2015 -0400 Committer: Josh Elser Committed: Thu Mar 19 18:57:12 2015 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/ScanIteratorIT.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/bdedcde8/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java b/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java index 4a791c0..438279d 100644 --- a/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java @@ -51,8 +51,11 @@ import org.apache.hadoop.security.UserGroupInformation; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ScanIteratorIT extends AccumuloClusterIT { + private static final Logger log = LoggerFactory.getLogger(ScanIteratorIT.class); @Override public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { @@ -86,6 +89,10 @@ public class ScanIteratorIT extends AccumuloClusterIT { userToken = new PasswordToken(clusterUser.getPassword()); saslEnabled = false; } + if (connector.securityOperations().listLocalUsers().contains(user)) { + log.info("Dropping {}", user); + connector.securityOperations().dropLocalUser(user); + } connector.securityOperations().createLocalUser(user, userToken); connector.securityOperations().grantTablePermission(user, tableName, TablePermission.READ); connector.securityOperations().grantTablePermission(user, tableName, TablePermission.WRITE);