etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1648 from shapeblue/4.9-fixmarvintest 

test/integration: fix tearDown order in list_acl_ teststest/integration: fix tearDown order in list_acl_ tests

    In several of the list_acl_tests, the tests run for simulator only where
    in the (class) setup domains and accounts are created for the test. When the
    tests end the (class) teardown methods would delete and remove these resources.
    Due to dependence of one of the resources on the other, domain2 on domain1,
    domain2 needs to be removed/cleaned up before domain1. Due to this issue,
    several Travis test runs have failed in the past such as:

    https://travis-ci.org/apache/cloudstack/jobs/152610967
    https://travis-ci.org/apache/cloudstack/jobs/152610968

    Changing the order of cleanup fixes the tests.

/cc @jburwell @karuturi

The fix is specific to tests that run 'only' on simulator with Travis. A passing Travis run should be enough to validate the changes.

* pr/1648:
  test/integration: fix tearDown order in list_acl_ tests

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2016-08-29 12:10:33 +05:30
parent f7d6fea821 157b8147b9
commit b9801ef475
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()