To Verify that list templates by domain admin is not listing the templates of other Domains.....Made changes as per comments

This commit is contained in:
manasaVeloori 2015-04-24 14:01:10 +05:30 committed by sanjeev
parent 293b9852c5
commit 23f4c022c2

View File

@ -20,9 +20,10 @@ from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (Account, from marvin.lib.base import (Account,
Domain, Template Domain, Template
) )
from marvin.lib.utils import (cleanup_resources) from marvin.lib.utils import (cleanup_resources, validateList)
from marvin.lib.common import (get_zone, get_builtin_template_info) from marvin.lib.common import (get_zone, get_builtin_template_info)
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.codes import PASS
import time import time
@ -114,30 +115,11 @@ class TestlistTemplatesDomainAdmin(cloudstackTestCase):
account=self.account1.name, account=self.account1.name,
domainid=self.domain1.id domainid=self.domain1.id
) )
if isinstance(listTemplateResponse, list): status = validateList(listTemplateResponse)
break self.assertEquals(
elif timeout == 0: PASS,
raise Exception("list template failed") status[0],
"Template creation failed")
time.sleep(10)
timeout = timeout - 1
self.assertEqual(
isinstance(listTemplateResponse, list),
True,
"Check for list template response return valid data")
self.assertNotEqual(
len(listTemplateResponse),
0,
"Check template available in List Templates")
template_response = listTemplateResponse[0]
self.assertEqual(
template_response.isready,
True,
"Template state is not ready, it is %s" % template_response.isready
)
listtemplate = Template.list( listtemplate = Template.list(
self.apiclient, self.apiclient,