diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-03 17:49:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-03 17:49:58 +0000 |
| commit | 907ea44dfdc6d5349ac6086e6647abaf2829b052 (patch) | |
| tree | bfd710e82face75c0c1bece992dbe9e64a117f57 /nova | |
| parent | 545d5ddd6b2f8bdfe394d80c7af33e07472f9b95 (diff) | |
| parent | 53ddedf90a870400627e4753b16f0162ba30bc25 (diff) | |
| download | nova-907ea44dfdc6d5349ac6086e6647abaf2829b052.tar.gz nova-907ea44dfdc6d5349ac6086e6647abaf2829b052.tar.xz nova-907ea44dfdc6d5349ac6086e6647abaf2829b052.zip | |
Merge "Fix assertRaises(Exception, ...) HACKING violation"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/network/test_manager.py | 5 |
1 files 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. |