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-08-29 12:15:53 +05:30
parent 38259a9a8c b9801ef475
commit fcc8dcd5d7
No known key found for this signature in database
GPG Key ID: 484248210EE3D884
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/integration/component/test_acl_listsnapshot.py
View File

@ -360,8 +360,8 @@ class TestSnapshotList(cloudstackTestCase):
cls.service_offering,
]
except Exception as e:
cls.domain_1.delete(cls.apiclient,cleanup="true")
cls.domain_2.delete(cls.apiclient,cleanup="true")
cls.domain_1.delete(cls.apiclient,cleanup="true")
cleanup_resources(cls.apiclient, cls.cleanup)
raise Exception("Failed to create the setup required to execute the test cases: %s" % e)
@ -370,10 +370,11 @@ class TestSnapshotList(cloudstackTestCase):
cls.apiclient = super(TestSnapshotList, cls).getClsTestClient().getApiClient()
cls.apiclient.connection.apiKey = cls.default_apikey
cls.apiclient.connection.securityKey = cls.default_secretkey
cls.domain_1.delete(cls.apiclient,cleanup="true")
cls.domain_2.delete(cls.apiclient,cleanup="true")
try:
cls.domain_2.delete(cls.apiclient,cleanup="true")
cls.domain_1.delete(cls.apiclient,cleanup="true")
except: pass
cleanup_resources(cls.apiclient, cls.cleanup)
return
def setUp(cls):
cls.apiclient = cls.testClient.getApiClient()

9
test/integration/component/test_acl_listvm.py
View File

@ -333,8 +333,8 @@ class TestVMList(cloudstackTestCase):
cls.service_offering,
]
except Exception as e:
cls.domain_1.delete(cls.apiclient,cleanup="true")
cls.domain_2.delete(cls.apiclient,cleanup="true")
cls.domain_1.delete(cls.apiclient,cleanup="true")
cleanup_resources(cls.apiclient, cls.cleanup)
raise Exception("Failed to create the setup required to execute the test cases: %s" % e)
@ -343,10 +343,11 @@ class TestVMList(cloudstackTestCase):
cls.apiclient = super(TestVMList, cls).getClsTestClient().getApiClient()
cls.apiclient.connection.apiKey = cls.default_apikey
cls.apiclient.connection.securityKey = cls.default_secretkey
cls.domain_1.delete(cls.apiclient,cleanup="true")
cls.domain_2.delete(cls.apiclient,cleanup="true")
try:
cls.domain_2.delete(cls.apiclient,cleanup="true")
cls.domain_1.delete(cls.apiclient,cleanup="true")
except: pass
cleanup_resources(cls.apiclient, cls.cleanup)
return
def setUp(cls):
cls.apiclient = cls.testClient.getApiClient()

9
test/integration/component/test_acl_listvolume.py
View File

@ -345,8 +345,8 @@ class TestVolumeList(cloudstackTestCase):
cls.service_offering,
]
except Exception as e:
cls.domain_1.delete(cls.apiclient,cleanup="true")
cls.domain_2.delete(cls.apiclient,cleanup="true")
cls.domain_1.delete(cls.apiclient,cleanup="true")
cleanup_resources(cls.apiclient, cls.cleanup)
raise Exception("Failed to create the setup required to execute the test cases: %s" % e)
@ -358,9 +358,10 @@ class TestVolumeList(cloudstackTestCase):
cls.apiclient.connection.apiKey = cls.default_apikey
cls.apiclient.connection.securityKey = cls.default_secretkey
cleanup_resources(cls.apiclient, cls.cleanup)
cls.domain_1.delete(cls.apiclient,cleanup="true")
cls.domain_2.delete(cls.apiclient,cleanup="true")
return
try:
cls.domain_2.delete(cls.apiclient,cleanup="true")
cls.domain_1.delete(cls.apiclient,cleanup="true")
except: pass
def setUp(cls):
cls.apiclient = cls.testClient.getApiClient()