You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/06/20 11:12:20 UTC
git commit: updated refs/heads/master to 06fbaf5
Repository: cloudstack
Updated Branches:
refs/heads/master e054154ca -> 06fbaf59c
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/06fbaf59
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06fbaf59
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06fbaf59
Branch: refs/heads/master
Commit: 06fbaf59cc840df9fda96af908c70ab08301d72e
Parents: e054154
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Fri Jun 20 14:39:52 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Jun 20 14:42:06 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/06fbaf59/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