You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/08 11:45:40 UTC
[19/50] [abbrv] git commit: updated refs/heads/feature/vpc-ipv6 to
6140db5
CLOUDSTACK:8515: Skipping snapshot test case for HyperV and LXC
Signed-off-by: Gaurav Aradhye <ga...@clogeny.com>
This closes #347
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2b1ec2c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2b1ec2c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2b1ec2c
Branch: refs/heads/feature/vpc-ipv6
Commit: f2b1ec2c7d1a81c60a49545272503c783f7c70bb
Parents: d6052a3
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Jun 2 16:17:17 2015 +0530
Committer: Gaurav Aradhye <ga...@clogeny.com>
Committed: Tue Jun 2 16:18:51 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_project_resources.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2b1ec2c/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index 142b08c..0816e9d 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -41,8 +41,7 @@ from marvin.lib.common import (get_zone,
list_volumes,
list_network_offerings,
list_lb_rules,
- get_free_vlan,
- wait_for_cleanup)
+ get_free_vlan)
from marvin.lib.utils import cleanup_resources
import random
@@ -787,8 +786,10 @@ class TestSnapshots(cloudstackTestCase):
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.hypervisor = cls.testClient.getHypervisorInfo()
- if cls.hypervisor.lower() in ['lxc']:
- raise unittest.SkipTest("snapshots are not supported on %s" % cls.hypervisor.lower())
+ cls._cleanup = []
+ cls.snapshotSupported = True
+ if cls.hypervisor.lower() in ['hyperv', 'lxc']:
+ cls.snapshotSupported = False
cls.template = get_template(
cls.api_client,
@@ -863,6 +864,9 @@ class TestSnapshots(cloudstackTestCase):
# 3. Verify snapshot created inside project can only be used in inside
# the project
+ if not self.snapshotSupported:
+ self.skipTest("Snapshot is not supported on %s" % self.hypervisor)
+
self.debug("Deploying VM for Project: %s" % self.project.id)
virtual_machine_1 = VirtualMachine.create(
self.apiclient,