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 2013/12/30 10:11:16 UTC
[2/2] git commit: updated refs/heads/master to 5882123
CLOUDSTACK-5640: Correcting imports in test cases
Conflicts:
test/integration/component/test_security_groups.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5882123f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5882123f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5882123f
Branch: refs/heads/master
Commit: 5882123f19b27baab579ee4ef6de752614208a85
Parents: 50be9a4
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Mon Dec 30 14:37:40 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Mon Dec 30 14:40:58 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_memory_limits.py | 4 ++--
test/integration/component/test_snapshots_improvement.py | 7 +++----
test/integration/component/test_vmware_drs.py | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5882123f/test/integration/component/test_memory_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_memory_limits.py b/test/integration/component/test_memory_limits.py
index 7da85a5..7921e4b 100644
--- a/test/integration/component/test_memory_limits.py
+++ b/test/integration/component/test_memory_limits.py
@@ -29,11 +29,11 @@ from marvin.integration.lib.base import (
from marvin.integration.lib.common import (get_domain,
get_zone,
get_template,
- cleanup_resources,
- wait_for_cleanup,
+ wait_for_cleanup,
find_suitable_host,
get_resource_type
)
+from marvin.integration.lib.utils import cleanup_resources
class Services:
"""Test memory resource limit services
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5882123f/test/integration/component/test_snapshots_improvement.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots_improvement.py b/test/integration/component/test_snapshots_improvement.py
index 190db55..77c240d 100644
--- a/test/integration/component/test_snapshots_improvement.py
+++ b/test/integration/component/test_snapshots_improvement.py
@@ -20,7 +20,9 @@
# Import Local Modules
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.utils import (random_gen)
+from marvin.integration.lib.utils import (random_gen,
+ is_snapshot_on_nfs,
+ cleanup_resources)
from marvin.integration.lib.base import (
Account,
ServiceOffering,
@@ -33,7 +35,6 @@ from marvin.integration.lib.base import (
from marvin.integration.lib.common import (get_domain,
get_zone,
get_template,
- cleanup_resources,
list_snapshots
)
from marvin.cloudstackAPI import (createSnapshot,
@@ -42,8 +43,6 @@ from marvin.cloudstackAPI import (createSnapshot,
listOsTypes,
stopVirtualMachine
)
-from marvin.integration.lib.utils import is_snapshot_on_nfs
-
class Services:
def __init__(self):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5882123f/test/integration/component/test_vmware_drs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py
index 8eeb2c3..6a99911 100644
--- a/test/integration/component/test_vmware_drs.py
+++ b/test/integration/component/test_vmware_drs.py
@@ -29,7 +29,7 @@ from marvin.integration.lib.base import (Account,
VirtualMachine,
ServiceOffering)
-from marvin.integration.lib.commom import (get_zone,
+from marvin.integration.lib.common import (get_zone,
get_template,
get_domain,
get_pod