cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject git commit: updated refs/heads/master to 8315be6
Date Fri, 29 May 2015 07:09:19 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 161cc194d -> 8315be61a


CLOUDSTACK-8515: Skipping snapshot test cases for HyperV and LXC

Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #324


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8315be61
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8315be61
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8315be61

Branch: refs/heads/master
Commit: 8315be61ad033307ea5a11d2638ed699e42ee8b1
Parents: 161cc19
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Fri May 29 12:35:28 2015 +0530
Committer: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Committed: Fri May 29 12:38:53 2015 +0530

----------------------------------------------------------------------
 .../testpaths/testpath_volume_cuncurrent_snapshots.py     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8315be61/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py b/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py
index fa86281..ffc6fd0 100644
--- a/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py
+++ b/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py
@@ -148,6 +148,12 @@ class TestConcurrentSnapshots(cloudstackTestCase):
             cls.testdata["ostype"])
 
         cls._cleanup = []
+        cls.vm_pool = []
+        cls.snapshotSupported = True
+
+        if cls.hypervisor.lower() in ["hyperv", "lxc"]:
+            cls.snapshotSupported = False
+            return
 
         # Set sleep time as per Snapshot Recurring Policy - HOURLY
         cls.sleep_time_for_hourly_policy = 60 * 60 * 1
@@ -177,7 +183,6 @@ class TestConcurrentSnapshots(cloudstackTestCase):
             )
             cls._cleanup.append(cls.service_offering)
 
-            cls.vm_pool = []
             for i in range(4):
                 cls.vm = VirtualMachine.create(
                     cls.apiclient,
@@ -236,6 +241,9 @@ class TestConcurrentSnapshots(cloudstackTestCase):
         self.dbclient = self.testClient.getDbConnection()
         self.cleanup = []
 
+        if not self.snapshotSupported:
+            self.skipTest("Snapshot is not supported on %s" % self.hypervisor)
+
     def tearDown(self):
         try:
             cleanup_resources(self.apiclient, self.cleanup)


Mime
View raw message