This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 85ad4639b05ee41b25c154f4ad4650795eca26b9 Author: Rohit Yadav <rohit.ya...@shapeblue.com> AuthorDate: Wed May 2 15:55:14 2018 +0530 test/integration: fix invalid VMware smoketests failures Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> --- test/integration/smoke/test_service_offerings.py | 3 +-- test/integration/smoke/test_vm_life_cycle.py | 10 +++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py index 2788d0e..9d05a7a 100644 --- a/test/integration/smoke/test_service_offerings.py +++ b/test/integration/smoke/test_service_offerings.py @@ -448,7 +448,7 @@ class TestCpuCapServiceOfferings(cloudstackTestCase): cls.apiclient = testClient.getApiClient() cls.services = testClient.getParsedTestDataConfig() cls.hypervisor = testClient.getHypervisorInfo() - + cls._cleanup = [] cls.hypervisorNotSupported = False if cls.hypervisor.lower() not in ["kvm"]: cls.hypervisorNotSupported = True @@ -516,7 +516,6 @@ class TestCpuCapServiceOfferings(cloudstackTestCase): cls.offering, cls.account ] - return @classmethod def tearDownClass(cls): diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index d882c1f..a2daee8 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -794,6 +794,10 @@ class TestSecuredVmMigration(cloudstackTestCase): cls.apiclient = testClient.getApiClient() cls.services = testClient.getParsedTestDataConfig() cls.hypervisor = testClient.getHypervisorInfo() + cls._cleanup = [] + + if cls.hypervisor.lower() not in ["kvm"]: + return # Get Zone, Domain and templates domain = get_domain(cls.apiclient) @@ -846,12 +850,12 @@ class TestSecuredVmMigration(cloudstackTestCase): self.apiclient = self.testClient.getApiClient() self.dbclient = self.testClient.getDbConnection() self.cleanup = [] - self.updateConfiguration("ca.plugin.root.auth.strictness", "false") - self.make_all_hosts_secure() - if self.hypervisor.lower() not in ["kvm"]: self.skipTest("Secured migration is not supported on other than KVM") + self.updateConfiguration("ca.plugin.root.auth.strictness", "false") + self.make_all_hosts_secure() + def tearDown(self): self.make_all_hosts_secure() -- To stop receiving notification emails like this one, please contact ro...@apache.org.