Repository: cloudstack Updated Branches: refs/heads/pytest 152c22603 -> 7c19ad3f1
skip one test case for now, which blocks forever Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c19ad3f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c19ad3f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c19ad3f Branch: refs/heads/pytest Commit: 7c19ad3f1aef91082470308111a376587c8acc49 Parents: 152c226 Author: Edison Su <[email protected]> Authored: Thu Sep 18 07:40:14 2014 +0000 Committer: Edison Su <[email protected]> Committed: Thu Sep 18 07:40:14 2014 +0000 ---------------------------------------------------------------------- test/integration/smoke/test_affinity_groups.py | 1 - test/integration/smoke/test_vm_life_cycle.py | 2 +- tools/marvin/marvin/utils.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c19ad3f/test/integration/smoke/test_affinity_groups.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py index a01beba..772ea3d 100644 --- a/test/integration/smoke/test_affinity_groups.py +++ b/test/integration/smoke/test_affinity_groups.py @@ -23,7 +23,6 @@ from marvin.lib.utils import * from marvin.lib.base import * from marvin.lib.common import * from marvin.sshClient import SshClient -from nose.plugins.attrib import attr import pytest class TestDeployVmWithAffinityGroup(cloudstackTestCase): http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c19ad3f/test/integration/smoke/test_vm_life_cycle.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 650dcf6..f0656fe 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -359,7 +359,7 @@ class TestVMLifeCycle(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false", BugId="CLOUDSTACK-6984") + @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true", BugId="CLOUDSTACK-6984") def test_vm_life_cycle(self): self.stop_vm() self.start_vm() http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c19ad3f/tools/marvin/marvin/utils.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/utils.py b/tools/marvin/marvin/utils.py index ef14730..fd40a8b 100644 --- a/tools/marvin/marvin/utils.py +++ b/tools/marvin/marvin/utils.py @@ -1,6 +1,6 @@ __author__ = 'edison' import os -from marvin.marvinPlugin import MarvinInit +from marvin.marvinInit import MarvinInit from marvin.codes import FAILED def getMarvin(): @@ -43,4 +43,4 @@ def initTestClass(cls, idenifier): if cls.clstestclient is None: cls.clstestclient = marvinObj.getTestClient() - marvinObj.getTestClient().identifier = idenifier \ No newline at end of file + marvinObj.getTestClient().identifier = idenifier
