From 17ddb4b1006a872838d299edced596055760fd73 Mon Sep 17 00:00:00 2001 From: Sanjeev Neelarapu Date: Wed, 17 Jun 2015 14:54:59 +0530 Subject: [PATCH] Skip VPC tests on LXC This closes #470 --- test/integration/testpaths/testpath_vmlc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 test/integration/testpaths/testpath_vmlc.py diff --git a/test/integration/testpaths/testpath_vmlc.py b/test/integration/testpaths/testpath_vmlc.py old mode 100644 new mode 100755 index f6c864061f3..c8b52fa3490 --- a/test/integration/testpaths/testpath_vmlc.py +++ b/test/integration/testpaths/testpath_vmlc.py @@ -307,6 +307,7 @@ class TestPathVMLC(cloudstackTestCase): # cleaned up properly, continue if VM deletion fails, # because in that case VM is already deleted from the test case try: + self.virtual_machine.delete(self.apiclient, expunge=True) except Exception: self.debug("Exception while destroying VM") @@ -337,7 +338,7 @@ class TestPathVMLC(cloudstackTestCase): # 13. Find suitable host for VM to migrate and migrate the VM # 14. Verify VM accessibility on new host """ - if self.hypervisor.lower() == 'hyperv' and value == VPC_NETWORK: + if self.hypervisor.lower() in ['hyperv', 'lxc'] and value == VPC_NETWORK: self.skipTest("cann't be run for {} hypervisor".format(self.hypervisor)) # List created service offering in setUpClass by name @@ -737,7 +738,7 @@ class TestPathVMLC(cloudstackTestCase): # 4. Try to stop the VM in destroyed state, operation should fail # 5. Try to reboot the VM in destroyed state, operation should fail """ - if self.hypervisor.lower() == 'hyperv' and value == VPC_NETWORK: + if self.hypervisor.lower() in ['hyperv', 'lxc'] and value == VPC_NETWORK: self.skipTest("cann't be run for {} hypervisor".format(self.hypervisor)) network = CreateNetwork(self, value) networkid = network.id @@ -834,7 +835,7 @@ class TestPathVMLC(cloudstackTestCase): # 7. Try to recover the VM in expunging state, operation should fail """ - if self.hypervisor.lower() == 'hyperv' and value == VPC_NETWORK: + if self.hypervisor.lower() in ['hyperv', 'lxc'] and value == VPC_NETWORK: self.skipTest("cann't be run for {} hypervisor".format(self.hypervisor)) network = CreateNetwork(self, value) networkid = network.id