Use addCleanup instead of tearDown
We should use addCleanup instead of tearDown because:
- tearDown is executed only if the test succeeds
- cleanups (defined with addCleanup) are executed even if the test fails
This change removes useless tearDown and transforms remaining ones into
addCleanup.
Change-Id: I44bd26dcb5c8456126a35cb807f0bafc772c0ab0
diff --git a/neutron/tests/tempest/api/test_dhcp_ipv6.py b/neutron/tests/tempest/api/test_dhcp_ipv6.py
index bf45825..b1a3361 100644
--- a/neutron/tests/tempest/api/test_dhcp_ipv6.py
+++ b/neutron/tests/tempest/api/test_dhcp_ipv6.py
@@ -27,6 +27,10 @@
class NetworksTestDHCPv6(base.BaseNetworkTest):
_ip_version = 6
+ def setUp(self):
+ super(NetworksTestDHCPv6, self).setUp()
+ self.addCleanup(self._clean_network)
+
@classmethod
def skip_checks(cls):
msg = None
@@ -92,7 +96,3 @@
self.network,
fixed_ips=[{'subnet_id': subnet['id'],
'ip_address': ip}])
-
- def tearDown(self):
- self._clean_network()
- super(NetworksTestDHCPv6, self).tearDown()