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

CLOUDSTACK-5149: fixed cls._cleanup initialization issue

Browse Source
This commit is contained in:
SrikanteswaraRao Talluri 2013-11-12 19:20:14 +05:30
parent 5e14e1692d
commit c2078cd60c
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ class TestVMOwnership(cloudstackTestCase):
cls.service_offering = ServiceOffering.create(cls.api_client,
cls.services["service_offering"])
# Cleanup
cls._cleanup = [cls.service_offering]
cls._cleanup.append(cls.service_offering)
# Create domain, account, user, project and volumes.
cls.domain_account_user1 = create_domain_account_user()
cls.domain_account_user2 = create_domain_account_user()

36
test/integration/component/test_netscaler_lb.py
View File

@ -149,6 +149,7 @@ class TestLbSourceNat(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestLbSourceNat,
cls
@ -164,9 +165,7 @@ class TestLbSourceNat(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],
@ -359,6 +358,7 @@ class TestLbOnIpWithPf(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestLbOnIpWithPf,
cls
@ -374,9 +374,7 @@ class TestLbOnIpWithPf(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],
@ -573,6 +571,7 @@ class TestPfOnIpWithLb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestPfOnIpWithLb,
cls
@ -588,9 +587,7 @@ class TestPfOnIpWithLb(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],
@ -788,6 +785,7 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestLbOnNonSourceNat,
cls
@ -803,9 +801,7 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],
@ -1006,6 +1002,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestAddMultipleVmsLb,
cls
@ -1021,9 +1018,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],
@ -1286,6 +1281,7 @@ class TestMultipleLbRules(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestMultipleLbRules,
cls
@ -1301,9 +1297,7 @@ class TestMultipleLbRules(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],
@ -1606,6 +1600,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestMultipleLbRulesSameIp,
cls
@ -1619,11 +1614,10 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
cls.zone.id,
cls.services["ostype"]
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],

10
test/integration/component/test_netscaler_lb_algo.py
View File

@ -116,6 +116,7 @@ class TestLbWithRoundRobin(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestLbWithRoundRobin,
cls
@ -131,9 +132,7 @@ class TestLbWithRoundRobin(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],
@ -330,6 +329,7 @@ class TestLbWithLeastConn(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.api_client = super(
TestLbWithLeastConn,
cls
@ -345,9 +345,7 @@ class TestLbWithLeastConn(cloudstackTestCase):
)
try:
cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"])
cls._cleanup = [
cls.netscaler
]
cls._cleanup.append(cls.netscaler)
cls.network_offering = NetworkOffering.create(
cls.api_client,
cls.services["network_offering"],