cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/4.4-forward to 9563db7
Date Fri, 20 Jun 2014 09:10:07 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward d8cbba1bc -> 9563db7a6


CLOUDSTACK-6943: Skip VM snapshot tests on KVM


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

Branch: refs/heads/4.4-forward
Commit: 9563db7a6d9d89558abc09e4ff786accfc0a9513
Parents: d8cbba1
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Fri Jun 20 14:39:52 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Fri Jun 20 14:39:52 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_vm_snapshots.py | 26 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9563db7a/test/integration/smoke/test_vm_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py
index 7b238dc..01626f5 100644
--- a/test/integration/smoke/test_vm_snapshots.py
+++ b/test/integration/smoke/test_vm_snapshots.py
@@ -16,19 +16,31 @@
 # under the License.
 
 # Import Local Modules
-from marvin.codes import FAILED
+from marvin.codes import FAILED, KVM
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import startVirtualMachine
+from marvin.lib.utils import random_gen, cleanup_resources
+from marvin.lib.base import (Account,
+                             ServiceOffering,
+                             VirtualMachine,
+                             VmSnapshot)
+from marvin.lib.common import (get_zone,
+                               get_domain,
+                               get_template,
+                               list_virtual_machines)
+import time
 
 class TestVmSnapshot(cloudstackTestCase):
 
     @classmethod
     def setUpClass(cls):
-	testClient = super(TestVmSnapshot, cls).getClsTestClient()
+        testClient = super(TestVmSnapshot, cls).getClsTestClient()
+
+        hypervisor = testClient.getHypervisorInfo()
+        if hypervisor.lower() == KVM.lower():
+            raise unittest.SkipTest("VM snapshot feature is not supported on KVM")
+
         cls.apiclient = testClient.getApiClient()
         cls.services = testClient.getParsedTestDataConfig()
         # Get Zone, Domain and templates


Mime
View raw message