From 3edcb2fad1194ed31b54215da052dcb6ed3b7705 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Mon, 11 Jul 2011 07:49:34 -0700
Subject: [PATCH] pre trunk merge

---
 nova/tests/test_network.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index d5cab47c..b09021e1 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -268,6 +268,6 @@ class CommonNetworkTestCase(test.TestCase):
 
     def test_remove_fixed_ip_from_instance_bad_input(self):
         manager = self.FakeNetworkManager()
-        self.assertRaises(exception.FixedIpNotFound,
+        self.assertRaises(exception.FixedIpNotFoundForSpecificInstance,
                           manager.remove_fixed_ip_from_instance,
                           None, 99, 'bad input')