diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-09 15:29:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-09 15:29:37 +0000 |
| commit | f6ae266057fee59fa8f8cb02c98661b3cb830125 (patch) | |
| tree | 8dbaa9a4bcc943ac345608dbe640b210b79c4ef1 | |
| parent | 247feeae3f2abb7fa5729be03371b934a8a8a394 (diff) | |
| parent | 806f1cfe3f01a0cb5c717508683f50927c47af7a (diff) | |
Merge "Fix a bad tearDown method in test_quantumv2.py."
| -rw-r--r-- | nova/tests/network/test_quantumv2.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nova/tests/network/test_quantumv2.py b/nova/tests/network/test_quantumv2.py index 6a3b31412..ab8752dec 100644 --- a/nova/tests/network/test_quantumv2.py +++ b/nova/tests/network/test_quantumv2.py @@ -129,6 +129,7 @@ class TestQuantumv2(test.TestCase): def setUp(self): super(TestQuantumv2, self).setUp() + self.addCleanup(CONF.reset) self.mox.StubOutWithMock(quantumv2, 'get_client') self.moxed_client = self.mox.CreateMock(client.Client) quantumv2.get_client(mox.IgnoreArg()).MultipleTimes().AndReturn( @@ -238,13 +239,9 @@ class TestQuantumv2(test.TestCase): 'fixed_ip_address': fixed_ip_address, 'router_id': 'router_id1'} self._returned_nw_info = [] - - def tearDown(self): - self.addCleanup(CONF.reset) - self.addCleanup(self.mox.VerifyAll) - self.addCleanup(self.mox.UnsetStubs) self.addCleanup(self.stubs.UnsetAll) - super(TestQuantumv2, self).tearDown() + self.addCleanup(self.mox.UnsetStubs) + self.addCleanup(self.mox.VerifyAll) def _verify_nw_info(self, nw_inf, index=0): id_suffix = index + 1 |