etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5640: Correcting imports in test cases

This commit is contained in:
Gaurav Aradhye 2013-12-30 14:37:40 +05:30 committed by Girish Shilamkar
parent 662383e24b
commit cbe93be2e9
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/component/test_memory_limits.py
View File

@ -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

2
test/integration/component/test_security_groups.py
View File

@ -656,7 +656,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
# SSH Attempt to VM should fail
with self.assertRaises(Exception):
self.debug("SSH into VM: %s" % self.virtual_machine.id)
SshClient(
SshClient(
self.virtual_machine.ssh_ip,
self.virtual_machine.ssh_port,
self.virtual_machine.username,

7
test/integration/component/test_snapshots_improvement.py
View File

@ -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):

2
test/integration/component/test_vmware_drs.py
View File

@ -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