mirror of https://github.com/apache/cloudstack.git
CLOUDSTACK-5674: Minor fixes to BVT tests
This commit is contained in:
parent
34409d74cd
commit
4779e575bb
|
|
@ -230,10 +230,9 @@ class TestPortForwarding(cloudstackTestCase):
|
|||
testClient = super(TestPortForwarding, cls).getClsTestClient()
|
||||
cls.apiclient = testClient.getApiClient()
|
||||
cls.services = testClient.getParsedTestDataConfig()
|
||||
|
||||
# Get Zone, Domain and templates
|
||||
cls.domain = get_domain(cls.apiclient)
|
||||
cls.zone = get_zone(cls.apiclient, cls.getZoneForTests())
|
||||
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
|
||||
template = get_template(
|
||||
cls.apiclient,
|
||||
cls.zone.id,
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
|
|||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.testClient = super(TestDedicatePublicIPRange, cls).getClsTestClient()
|
||||
cls.apiclient = cls.testClient.getApiClient()
|
||||
cls.apiclient = cls.testClient.getApiClient()
|
||||
cls.services = cls.testClient.getParsedTestDataConfig()
|
||||
# Get Zone, Domain
|
||||
cls.domain = get_domain(cls.apiclient)
|
||||
cls.zone = get_zone(cls.apiclient, cls.getClsTestClient.getZoneForTests())
|
||||
cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
|
||||
|
||||
# Create Account
|
||||
cls.account = Account.create(
|
||||
|
|
|
|||
|
|
@ -187,6 +187,8 @@ class TestSecStorageServices(cloudstackTestCase):
|
|||
listall=True,
|
||||
account='system'
|
||||
)
|
||||
self.assertEqual(validateList(list_template_response)[0], PASS,\
|
||||
"templates list validation failed")
|
||||
|
||||
# Ensure all BUILTIN templates are downloaded
|
||||
templateid = None
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class TestVmSnapshot(cloudstackTestCase):
|
|||
cls.zone.id,
|
||||
cls.services["ostype"]
|
||||
)
|
||||
if cls.template == FAILED:
|
||||
if template == FAILED:
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
|
||||
|
||||
cls.services["domainid"] = cls.domain.id
|
||||
|
|
@ -68,7 +68,7 @@ class TestVmSnapshot(cloudstackTestCase):
|
|||
accountid=cls.account.name,
|
||||
domainid=cls.account.domainid,
|
||||
serviceofferingid=cls.service_offering.id,
|
||||
mode=cls.services["mode"]
|
||||
mode=cls.zone.networktype
|
||||
)
|
||||
cls.random_data_0 = random_gen(size=100)
|
||||
cls.test_dir = "/tmp"
|
||||
|
|
|
|||
Loading…
Reference in New Issue