You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2015/04/16 14:15:43 UTC
git commit: updated refs/heads/master to cfb5be7
Repository: cloudstack
Updated Branches:
refs/heads/master 05e4ba735 -> cfb5be761
Corrected wrong references in the testpaths and skipped appropriately
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cfb5be76
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cfb5be76
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cfb5be76
Branch: refs/heads/master
Commit: cfb5be761ca42233e629ff2788ea03846460253d
Parents: 05e4ba7
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Thu Apr 16 17:44:37 2015 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Apr 16 17:45:24 2015 +0530
----------------------------------------------------------------------
test/integration/testpaths/testpath_vmlc.py | 8 ++++++++
test/integration/testpaths/testpath_volumelifecycle.py | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfb5be76/test/integration/testpaths/testpath_vmlc.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_vmlc.py b/test/integration/testpaths/testpath_vmlc.py
index 226621f..df743f8 100644
--- a/test/integration/testpaths/testpath_vmlc.py
+++ b/test/integration/testpaths/testpath_vmlc.py
@@ -170,6 +170,7 @@ class TestPathVMLC(cloudstackTestCase):
testClient = super(TestPathVMLC, cls).getClsTestClient()
cls.apiclient = testClient.getApiClient()
cls.testdata = testClient.getParsedTestDataConfig()
+ cls.hypervisor = testClient.getHypervisorInfo()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient)
@@ -336,6 +337,8 @@ 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:
+ self.skipTest("cann't be run for {} hypervisor".format(self.hypervisor))
# List created service offering in setUpClass by name
listServiceOfferings = ServiceOffering.list(
@@ -733,6 +736,8 @@ 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:
+ self.skipTest("cann't be run for {} hypervisor".format(self.hypervisor))
network = CreateNetwork(self, value)
networkid = network.id
@@ -827,6 +832,9 @@ class TestPathVMLC(cloudstackTestCase):
# 6. Try to destroy the VM in expunging state, operation should fail
# 7. Try to recover the VM in expunging state, operation should fail
"""
+
+ if self.hypervisor.lower() == 'hyperv' and value == VPC_NETWORK:
+ self.skipTest("cann't be run for {} hypervisor".format(self.hypervisor))
network = CreateNetwork(self, value)
networkid = network.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfb5be76/test/integration/testpaths/testpath_volumelifecycle.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py
index debcaae..55bfc89 100644
--- a/test/integration/testpaths/testpath_volumelifecycle.py
+++ b/test/integration/testpaths/testpath_volumelifecycle.py
@@ -37,7 +37,8 @@ from marvin.lib.utils import cleanup_resources, validateList
from marvin.lib.common import (get_zone,
get_domain,
get_template,
- list_virtual_machines)
+ list_virtual_machines,
+ find_storage_pool_type)
from nose.plugins.attrib import attr
import os
import urllib