Repository: cloudstack Updated Branches: refs/heads/4.4-forward ec49669f1 -> 8d8190ea4
CLOUDSTACK-7137: Resolving cleanup issue in test_escalations_securitygroups.py Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d8190ea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d8190ea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d8190ea Branch: refs/heads/4.4-forward Commit: 8d8190ea4e00edb0f7ce9665535adcc7a5b5097d Parents: ec49669 Author: Ashutosh K <[email protected]> Authored: Mon Jul 21 03:15:07 2014 -0400 Committer: Girish Shilamkar <[email protected]> Committed: Tue Jul 22 07:29:37 2014 -0400 ---------------------------------------------------------------------- .../test_escalations_securitygroups.py | 38 ++++---------------- 1 file changed, 7 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d8190ea/test/integration/component/test_escalations_securitygroups.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_escalations_securitygroups.py b/test/integration/component/test_escalations_securitygroups.py index 8934088..076477e 100644 --- a/test/integration/component/test_escalations_securitygroups.py +++ b/test/integration/component/test_escalations_securitygroups.py @@ -17,40 +17,15 @@ #Import Local Modules from marvin.cloudstackTestCase import cloudstackTestCase -from marvin.cloudstackAPI import (createVolume, - createTemplate) -from marvin.lib.base import (Volume, - Iso, - VirtualMachine, - Template, - Snapshot, - SecurityGroup, - Account, - Zone, - Network, - NetworkOffering, - DiskOffering, - ServiceOffering, - VmSnapshot, - SnapshotPolicy, - SSHKeyPair, - Resources, - Configurations, - VpnCustomerGateway, - Hypervisor, - VpcOffering, - VPC, - NetworkACL) +from marvin.lib.base import (SecurityGroup, + Account) from marvin.lib.common import (get_zone, get_domain, - get_template, - list_os_types) + get_template) from marvin.lib.utils import (validateList, - cleanup_resources, - random_gen) -from marvin.codes import (PASS, FAIL, EMPTY_LIST) + cleanup_resources) +from marvin.codes import (PASS, EMPTY_LIST) from nose.plugins.attrib import attr -import time class TestSecurityGroups(cloudstackTestCase): @@ -245,6 +220,7 @@ class TestSecurityGroups(cloudstackTestCase): SecurityGroup.delete( securitygroup_created, self.userapiclient) + self.cleanup.remove(securitygroup_created) # Listing all the security groups in page 2 again list_securitygroups_page2 = SecurityGroup.list( self.userapiclient, @@ -585,4 +561,4 @@ class TestSecurityGroups(cloudstackTestCase): status[2], "Security Groups Egress rule is not revoked" ) - return \ No newline at end of file + return
