You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 17:44:49 UTC
[22/24] git commit: updated refs/heads/4.4 to e33d4a5
CLOUDSTACK-6943: Skip VM snapshot tests on KVM
(cherry picked from commit 9563db7a6d9d89558abc09e4ff786accfc0a9513)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b848c02a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b848c02a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b848c02a
Branch: refs/heads/4.4
Commit: b848c02aa7a3bf4384e664c7db5f66b2482e4e7d
Parents: 8c37e46
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Fri Jun 20 14:39:52 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 17:43:36 2014 +0200
----------------------------------------------------------------------
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/b848c02a/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 e884d42..c324afa 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