summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJohn Tran <jhtran@att.com>2012-05-15 10:00:36 -0700
committerJohn Tran <jhtran@att.com>2012-05-18 07:15:31 -0700
commitc1e54e1968faa23dfa26796fdb8f3f8d9ba79367 (patch)
treefa6baded773a17fd3c25ef6ffd9da7a74f760442 /nova/tests
parent51e745fc1d9e44e04b55ecf2317df0b386d4eb05 (diff)
fixed_ip_get_by_address read_deleted from context
Fixes bug 996482. by default fixed_ip_get_by_address always sets read_deleted='yes'. Changed it to accept read_deleted value from context. updated .mailmap to rewrite my old email to new email Change-Id: If94251972df7bbcfdeebc226613edac0a3f41186
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_db_api.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index c1002d98a..1abd44a90 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -151,6 +151,8 @@ class DbApiTestCase(test.TestCase):
db.network_delete_safe, ctxt, network['id'])
db.fixed_ip_update(ctxt, address2, {'allocated': False})
network = db.network_delete_safe(ctxt, network['id'])
+ self.assertRaises(exception.FixedIpNotFoundForAddress,
+ db.fixed_ip_get_by_address, ctxt, address1)
ctxt = ctxt.elevated(read_deleted='yes')
fixed_ip = db.fixed_ip_get_by_address(ctxt, address1)
self.assertTrue(fixed_ip['deleted'])