openstack/neutron
Code Issues Proposed changes

Switch order for cleanup in NamespaceFixture

Browse Source 
In case ensure_namespace fails for any reason, the ip_wrapper attribute
is not created but destroy(), that uses this attribute, is still called.

TrivialFix

Change-Id: I4135f6564a180b4bd275312866d3dc6e4b9b63ca
This commit is contained in:
Jakub Libosvar
2016-09-02 14:00:03 +02:00
parent 1d4a621718
commit 5683f22f3d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/common/net_helpers.py
View File

@@ -519,8 +519,8 @@ class NamespaceFixture(fixtures.Fixture):
def _setUp(self): def _setUp(self):
ip = ip_lib.IPWrapper() ip = ip_lib.IPWrapper()
self.name = self.prefix + uuidutils.generate_uuid() self.name = self.prefix + uuidutils.generate_uuid()
self.addCleanup(self.destroy)
self.ip_wrapper = ip.ensure_namespace(self.name) self.ip_wrapper = ip.ensure_namespace(self.name)
self.addCleanup(self.destroy)
def destroy(self): def destroy(self):
if self.ip_wrapper.netns.exists(self.name): if self.ip_wrapper.netns.exists(self.name):