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

CLOUDSTACK-7684: Fixed Exception not raised issue in secondary storage limits test suite test_ss_max_limits.py

Browse Source 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
This commit is contained in:
Gaurav Aradhye 2014-10-08 11:57:45 +05:30 committed by SrikanteswaraRao Talluri
parent b9fed951ef
commit dc4b04fbe8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/integration/component/test_ss_max_limits.py
View File

@ -101,7 +101,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.services["template_2"]["hypervisor"] = builtin_info[1]
self.services["template_2"]["format"] = builtin_info[2]
template = Template.register(self.apiclient,
template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
account=self.child_do_admin.name if not inProject else None,
@ -110,7 +110,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
template.download(self.apiclient)
templates = Template.list(self.apiclient,
templates = Template.list(self.userapiclient,
templatefilter=\
self.services["template_2"]["templatefilter"],
id=template.id)
@ -131,6 +131,10 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.child_do_admin = Account.create(self.apiclient, self.services["account"], admin=True,
domainid=self.child_domain.id)
self.userapiclient = self.testClient.getUserApiClient(
UserName=self.child_do_admin.name,
DomainName=self.child_do_admin.domain)
# Create project as a domain admin
self.project = Project.create(self.apiclient, self.services["project"],
account=self.child_do_admin.name,
@ -195,11 +199,12 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
with self.assertRaises(Exception):
template = Template.register(self.apiclient,
template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
account=self.child_do_admin.name,
domainid=self.child_do_admin.domainid)
template.delete(self.userapiclient)
return
@attr(tags=["advanced"], required_hardware="false")
@ -231,11 +236,12 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
with self.assertRaises(Exception):
template = Template.register(self.apiclient,
template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
account=self.child_do_admin.name,
domainid=self.child_do_admin.domainid)
template.delete(self.userapiclient)
return
@attr(tags=["advanced"], required_hardware="false")
@ -256,7 +262,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
try:
projects = Project.list(self.apiclient, id=self.project.id, listall=True)
projects = Project.list(self.userapiclient, id=self.project.id, listall=True)
except Exception as e:
self.fail("failed to get projects list: %s" % e)
@ -272,8 +278,9 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
with self.assertRaises(Exception):
template = Template.register(self.apiclient,
template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
projectid=self.project.id)
template.delete(self.userapiclient)
return