Merge "Return HTTP 422 on bad server update PUT request."

1 files changed, 18 insertions, 1 deletions

diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 662a272f8..fd3597b68 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -4765,7 +4765,7 @@ class ServersAllExtensionsTestCase(test.TestCase):
         """Test create with malformed body"""
 
         def fake_create(*args, **kwargs):
-            raise Exception("Request should not reach the compute API.")
+            raise test.TestingException("Should not reach the compute API.")
 
         self.stubs.Set(nova.compute.api.API, 'create', fake_create)
 
@@ -4777,3 +4777,20 @@ class ServersAllExtensionsTestCase(test.TestCase):
         req.body = jsonutils.dumps(body)
         res = req.get_response(self.app)
         self.assertEqual(422, res.status_int)
+
+    def test_update_missing_server(self):
+        """Test create with malformed body"""
+
+        def fake_update(*args, **kwargs):
+            raise test.TestingException("Should not reach the compute API.")
+
+        self.stubs.Set(nova.compute.api.API, 'create', fake_update)
+
+        req = fakes.HTTPRequest.blank('/fake/servers/1')
+        req.method = 'PUT'
+        req.content_type = 'application/json'
+        body = {'foo': {'a': 'b'}}
+
+        req.body = jsonutils.dumps(body)
+        res = req.get_response(self.app)
+        self.assertEqual(422, res.status_int)