apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7137: Resolving cleanup issue in test_escalations_securitygroups.py

Browse Source
This commit is contained in:
Ashutosh K 2014-07-21 03:15:07 -04:00 committed by Girish Shilamkar
parent 3b32732459
commit 45888e214c
1 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/integration/component/test_escalations_securitygroups.py
View File

@ -17,40 +17,15 @@
#Import Local Modules #Import Local Modules
from marvin.cloudstackTestCase import cloudstackTestCase from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import (createVolume, from marvin.lib.base import (SecurityGroup,
createTemplate) Account)
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.common import (get_zone, from marvin.lib.common import (get_zone,
get_domain, get_domain,
get_template, get_template)
list_os_types)
from marvin.lib.utils import (validateList, from marvin.lib.utils import (validateList,
cleanup_resources, cleanup_resources)
random_gen) from marvin.codes import (PASS, EMPTY_LIST)
from marvin.codes import (PASS, FAIL, EMPTY_LIST)
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import time
class TestSecurityGroups(cloudstackTestCase): class TestSecurityGroups(cloudstackTestCase):
@ -245,6 +220,7 @@ class TestSecurityGroups(cloudstackTestCase):
SecurityGroup.delete( SecurityGroup.delete(
securitygroup_created, securitygroup_created,
self.userapiclient) self.userapiclient)
self.cleanup.remove(securitygroup_created)
# Listing all the security groups in page 2 again # Listing all the security groups in page 2 again
list_securitygroups_page2 = SecurityGroup.list( list_securitygroups_page2 = SecurityGroup.list(
self.userapiclient, self.userapiclient,
@ -585,4 +561,4 @@ class TestSecurityGroups(cloudstackTestCase):
status[2], status[2],
"Security Groups Egress rule is not revoked" "Security Groups Egress rule is not revoked"
) )
return return