Repository: cloudstack Updated Branches: refs/heads/master 54a664730 -> de6538c9e
SKIP vm migration tests on LXC since it is not a supported hypervisor This closes #383 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de6538c9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de6538c9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de6538c9 Branch: refs/heads/master Commit: de6538c9e781bf6630a106df81bbd4f08aa39777 Parents: 54a6647 Author: Sanjeev Neelarapu <sanjeev.neelar...@citrix.com> Authored: Wed Jun 10 17:12:18 2015 +0530 Committer: sanjeev <sanj...@apache.org> Committed: Wed Jun 10 17:29:18 2015 +0530 ---------------------------------------------------------------------- test/integration/testpaths/testpath_snapshot_hadrning.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de6538c9/test/integration/testpaths/testpath_snapshot_hadrning.py ---------------------------------------------------------------------- diff --git a/test/integration/testpaths/testpath_snapshot_hadrning.py b/test/integration/testpaths/testpath_snapshot_hadrning.py old mode 100644 new mode 100755 index d2bacd5..8a5a496 --- a/test/integration/testpaths/testpath_snapshot_hadrning.py +++ b/test/integration/testpaths/testpath_snapshot_hadrning.py @@ -1386,15 +1386,14 @@ class TestHardening(cloudstackTestCase): clusterid_tag_mapping = {} cwps_no = 0 - + cls.unsupportedHypervisor = False if cls.hypervisor.lower() not in [ "vmware", "kvm", "xenserver", "hyper-v"]: - raise unittest.SkipTest( - "Storage migration not supported on %s" % - cls.hypervisor) + cls.unsupportedHypervisor = True + return try: cls.pools = StoragePool.list( @@ -1510,6 +1509,8 @@ class TestHardening(cloudstackTestCase): self.apiclient = self.testClient.getApiClient() self.dbclient = self.testClient.getDbConnection() self.cleanup = [] + if self.unsupportedHypervisor: + self.skipTest("VM migration is not supported on %s" % self.hypervisor) def tearDown(self): try:
