etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.9'

This commit is contained in:
Rohit Yadav 2016-12-09 13:32:43 +05:30
parent 7df21f9cce b931b798f8
commit fac8c5fc2a
No known key found for this signature in database
GPG Key ID: 484248210EE3D884
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/component/test_templates.py
View File

@ -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")