From 53ddedf90a870400627e4753b16f0162ba30bc25 Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Tue, 3 Jul 2012 17:04:08 +0000 Subject: Fix assertRaises(Exception, ...) HACKING violation This managed to sneak in while tox wasn't gating on hacking tests Change-Id: I2a41ccef740bc602af8819ce03013ce890ff24ce --- nova/tests/network/test_manager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index 276681cad..b3a5ef0ea 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -951,7 +951,7 @@ class VlanNetworkTestCase(test.TestCase): def teardown_network_on_host(_context, network): if network['id'] == 0: - raise Exception('Correct network/fixed_ip assertion') + raise test.TestingException() self.stubs.Set(db, 'network_get', network_get) self.stubs.Set(self.network, '_teardown_network_on_host', @@ -976,7 +976,8 @@ class VlanNetworkTestCase(test.TestCase): elevated.read_deleted = 'yes' deallocate = self.network.deallocate_fixed_ip - self.assertRaises(Exception, deallocate, context1, fix_addr, 'fake') + self.assertRaises(test.TestingException, deallocate, context1, + fix_addr, 'fake') def test_deallocate_fixed_no_vif(self): """Verify that deallocate doesn't raise when no vif is returned. -- cgit