Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 814F5200BE5 for ; Fri, 9 Dec 2016 09:02:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8017E160B1D; Fri, 9 Dec 2016 08:02:38 +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 C9262160B1C for ; Fri, 9 Dec 2016 09:02:37 +0100 (CET) Received: (qmail 96467 invoked by uid 500); 9 Dec 2016 08:02:36 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 96448 invoked by uid 99); 9 Dec 2016 08:02:36 -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, 09 Dec 2016 08:02:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5F1EE040F; Fri, 9 Dec 2016 08:02:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Fri, 09 Dec 2016 08:02:36 -0000 Message-Id: <8442b66fc5704f57b6b14f946519499a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: updated refs/heads/4.9 to b931b79 archived-at: Fri, 09 Dec 2016 08:02:38 -0000 Repository: cloudstack Updated Branches: refs/heads/4.9 f03015b25 -> b931b798f CLOUDSTACK-9594: Fix regression in test_templates Fixes regression in component test `test_templates.py` Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae32aa13 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae32aa13 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae32aa13 Branch: refs/heads/4.9 Commit: ae32aa13ed2b484194b7df31ac8b531c2955a51c Parents: 8769597 Author: Rohit Yadav Authored: Fri Dec 9 11:57:40 2016 +0530 Committer: Rohit Yadav Committed: Fri Dec 9 11:57:40 2016 +0530 ---------------------------------------------------------------------- test/integration/component/test_templates.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae32aa13/test/integration/component/test_templates.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index fb56011..4e9a868 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -658,7 +658,7 @@ class TestListTemplate(cloudstackTestCase): UserName=self.account.name, DomainName=self.account.domain) try: - list_template_response = Template.list(self.user_api_client, templatefilter='all') + list_template_response = Template.list(user_api_client, templatefilter='all') self.fail("Regular User is able to use templatefilter='all' in listTemplates API call") except Exception as e: self.debug("ListTemplates API with templatefilter='all' is not permitted for normal user") @@ -674,6 +674,6 @@ class TestListTemplate(cloudstackTestCase): UserName=self.newdomain_account.name, DomainName=self.newdomain_account.domain) try: - list_template_response = Template.list(self.domain_user_api_client, templatefilter='all') + list_template_response = Template.list(domain_user_api_client, templatefilter='all') except Exception as e: self.fail("Domain admin should be able to use templatefilter='all' in listTemplates API call")