You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/06/17 12:22:16 UTC
git commit: updated refs/heads/master to 17ddb4b
Repository: cloudstack
Updated Branches:
refs/heads/master 85afa63f2 -> 17ddb4b10
Skip VPC tests on LXC
This closes #470
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17ddb4b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17ddb4b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17ddb4b1
Branch: refs/heads/master
Commit: 17ddb4b1006a872838d299edced596055760fd73
Parents: 85afa63
Author: Sanjeev Neelarapu <sa...@citrix.com>
Authored: Wed Jun 17 14:54:59 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed Jun 17 15:51:44 2015 +0530
----------------------------------------------------------------------
test/integration/testpaths/testpath_vmlc.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17ddb4b1/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 f6c8640..c8b52fa
--- 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