apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1823 from shapeblue/4.8-travis-templatefix

Browse Source 
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 <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2016-12-09 13:31:51 +05:30
commit f8c9f454d2
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, UserName=self.account.name,
DomainName=self.account.domain) DomainName=self.account.domain)
try: 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") self.fail("Regular User is able to use templatefilter='all' in listTemplates API call")
except Exception as e: except Exception as e:
self.debug("ListTemplates API with templatefilter='all' is not permitted for normal user") 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, UserName=self.newdomain_account.name,
DomainName=self.newdomain_account.domain) DomainName=self.newdomain_account.domain)
try: 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: except Exception as e:
self.fail("Domain admin should be able to use templatefilter='all' in listTemplates API call") self.fail("Domain admin should be able to use templatefilter='all' in listTemplates API call")