From commits-return-19176-archive-asf-public=cust-asf.ponee.io@phoenix.apache.org Fri Jan 19 19:03:19 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 0DBFA1807BC for ; Fri, 19 Jan 2018 19:03:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id F20E8160C1B; Fri, 19 Jan 2018 18:03:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C053E160C6F for ; Fri, 19 Jan 2018 19:03:12 +0100 (CET) Received: (qmail 40929 invoked by uid 500); 19 Jan 2018 18:03:11 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 40492 invoked by uid 99); 19 Jan 2018 18:03:11 -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, 19 Jan 2018 18:03:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89A76F352E; Fri, 19 Jan 2018 18:03:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tdsilva@apache.org To: commits@phoenix.apache.org Date: Fri, 19 Jan 2018 18:03:57 -0000 Message-Id: In-Reply-To: <3d55769618d147cea37da94cc39ed91d@git.apache.org> References: <3d55769618d147cea37da94cc39ed91d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] phoenix git commit: fix test failure. fix test failure. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/41f81423 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/41f81423 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/41f81423 Branch: refs/heads/system-catalog Commit: 41f81423322381fedd240302255f9cbb7d42d41d Parents: 338c650 Author: Thomas D'Silva Authored: Tue Jan 2 13:04:19 2018 -0800 Committer: Thomas D'Silva Committed: Tue Jan 2 13:04:56 2018 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/end2end/BasePermissionsIT.java | 4 ++-- .../org/apache/phoenix/end2end/TableDDLPermissionsIT.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/41f81423/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java index 9d7ef1b..9354b39 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java @@ -642,12 +642,12 @@ public class BasePermissionsIT extends BaseTest { }; } - AccessTestAction dropView(final String viewName) throws SQLException { + AccessTestAction dropView(final String viewName, final boolean cascade) throws SQLException { return new AccessTestAction() { @Override public Object run() throws Exception { try (Connection conn = getConnection(); Statement stmt = conn.createStatement();) { - assertFalse(stmt.execute("DROP VIEW " + viewName)); + assertFalse(stmt.execute("DROP VIEW " + viewName + ( cascade ? " CASCADE" : "" ) )); } return null; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/41f81423/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableDDLPermissionsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableDDLPermissionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableDDLPermissionsIT.java index 8666bb8..1c0c83f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableDDLPermissionsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableDDLPermissionsIT.java @@ -165,7 +165,7 @@ public class TableDDLPermissionsIT extends BasePermissionsIT { verifyDenied(createIndex(indexName2, phoenixTableName), AccessDeniedException.class, unprivilegedUser); verifyDenied(createView(viewName2, phoenixTableName),AccessDeniedException.class, unprivilegedUser); verifyDenied(createView(viewName3, viewName1), AccessDeniedException.class, unprivilegedUser); - verifyDenied(dropView(viewName1), AccessDeniedException.class, unprivilegedUser); + verifyDenied(dropView(viewName1, true), AccessDeniedException.class, unprivilegedUser); verifyDenied(dropIndex(indexName1, phoenixTableName), AccessDeniedException.class, unprivilegedUser); verifyDenied(dropTable(phoenixTableName), AccessDeniedException.class, unprivilegedUser); @@ -210,8 +210,8 @@ public class TableDDLPermissionsIT extends BasePermissionsIT { verifyAllowed(rebuildIndex(indexName1, phoenixTableName), regularUser1); verifyAllowed(addColumn(phoenixTableName, "val1"), regularUser1); verifyAllowed(addProperties(phoenixTableName, "GUIDE_POSTS_WIDTH", "100"), regularUser1); - verifyAllowed(dropView(viewName1), regularUser1); - verifyAllowed(dropView(viewName2), regularUser1); + verifyAllowed(dropView(viewName1, true), regularUser1); + verifyAllowed(dropView(viewName2, false), regularUser1); verifyAllowed(dropColumn(phoenixTableName, "val1"), regularUser1); verifyAllowed(dropIndex(indexName2, phoenixTableName), regularUser1); verifyAllowed(dropIndex(indexName1, phoenixTableName), regularUser1); @@ -222,7 +222,7 @@ public class TableDDLPermissionsIT extends BasePermissionsIT { verifyAllowed(createIndex(indexName1, phoenixTableName), superUser2); verifyAllowed(createView(viewName1, phoenixTableName), superUser2); verifyAllowed(readTable(phoenixTableName), superUser2); - verifyAllowed(dropView(viewName1), superUser2); + verifyAllowed(dropView(viewName1, false), superUser2); verifyAllowed(dropTable(phoenixTableName), superUser2); } finally {