diff options
| -rw-r--r-- | nova/api/openstack/servers.py | 1 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_scheduler.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 6dc168203..80f367199 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -56,6 +56,7 @@ class ConvertedException(exc.WSGIHTTPException): def novaclient_exception_converter(f): """Convert novaclient ClientException HTTP codes to webob exceptions. + Has to be the outer-most decorator. """ def new_f(*args, **kwargs): try: diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 3acb91f72..0b51792a0 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -1076,8 +1076,8 @@ class ZoneRedirectTest(test.TestCase): def test_unmarshal_single_server(self): decorator = api.reroute_compute("foo") decorator.item_uuid = 'fake_uuid' - self.assertTrue(isinstance(decorator.unmarshall_result([]), - exception.InstanceNotFound)) + result = decorator.unmarshall_result([]) + self.assertEquals(decorator.unmarshall_result([]), None) self.assertEquals(decorator.unmarshall_result( [FakeResource(dict(a=1, b=2)), ]), dict(server=dict(a=1, b=2))) @@ -1182,7 +1182,7 @@ class ZoneRedirectTest(test.TestCase): do_get(None, FakeContext(), FAKE_UUID) self.fail("Expected redirect exception") except api.RedirectResult, e: - self.assertTrue(isinstance(e.results, exception.InstanceNotFound)) + self.assertEquals(e.results, None) class FakeServerCollection(object): |