You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/09 08:02:36 UTC
[1/3] git commit: updated refs/heads/4.9 to b931b79
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 <ro...@shapeblue.com>
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 <ro...@shapeblue.com>
Authored: Fri Dec 9 11:57:40 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
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")
[3/3] git commit: updated refs/heads/4.9 to b931b79
Posted by bh...@apache.org.
Merge branch '4.8' into 4.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b931b798
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b931b798
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b931b798
Branch: refs/heads/4.9
Commit: b931b798f8909f01f3cde7b9354c583132c662dd
Parents: f03015b f8c9f45
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Dec 9 13:32:21 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Dec 9 13:32:21 2016 +0530
----------------------------------------------------------------------
test/integration/component/test_templates.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/4.9 to b931b79
Posted by bh...@apache.org.
Merge pull request #1823 from shapeblue/4.8-travis-templatefix
CLOUDSTACK-9594: Fix regression in test_templatesFixes regression in component test `test_templates.py`
* pr/1823:
CLOUDSTACK-9594: Fix regression in test_templates
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8c9f454
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8c9f454
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8c9f454
Branch: refs/heads/4.9
Commit: f8c9f454d2e388f17aeff5bfa1b6a2c96f5c771a
Parents: 8769597 ae32aa1
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Dec 9 13:31:51 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Dec 9 13:31:51 2016 +0530
----------------------------------------------------------------------
test/integration/component/test_templates.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------