Merge lp:~cerberus/nova/lp801195 into lp:~hudson-openstack/nova/trunk

[Matt Dietz]

This doesn't actually fix anything anymore, as the wsgi_refactor branch from Waldon took care of the issue. However, a couple rescue unit tests would have caught this originally, so I'm proposing this to include those.

[Josh Kearney (jk0)]

!!!

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[lp:~cerberus/nova/lp801195]

1245. By Matt Dietz on 2011-07-11

Bad test

[Brian Waldon (bcwaldon)]

Good stuff, Dietz.

review: Approve

=== modified file 'nova/tests/api/openstack/test_servers.py'
--- nova/tests/api/openstack/test_servers.py	2011-07-11 18:41:29 +0000
+++ nova/tests/api/openstack/test_servers.py	2011-07-11 21:28:27 +0000
@@ -1433,6 +1433,41 @@
         self.assertEqual(res.status, '202 Accepted')
         self.assertEqual(self.server_delete_called, True)
 
+    def test_rescue_accepted(self):
+        FLAGS.allow_admin_api = True
+        body = {}
+
+        self.called = False
+
+        def rescue_mock(*args, **kwargs):
+            self.called = True
+
+        self.stubs.Set(nova.compute.api.API, 'rescue', rescue_mock)
+        req = webob.Request.blank('/v1.0/servers/1/rescue')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+
+        res = req.get_response(fakes.wsgi_app())
+
+        self.assertEqual(self.called, True)
+        self.assertEqual(res.status_int, 202)
+
+    def test_rescue_raises_handled(self):
+        FLAGS.allow_admin_api = True
+        body = {}
+
+        def rescue_mock(*args, **kwargs):
+            raise Exception('Who cares?')
+
+        self.stubs.Set(nova.compute.api.API, 'rescue', rescue_mock)
+        req = webob.Request.blank('/v1.0/servers/1/rescue')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+
+        res = req.get_response(fakes.wsgi_app())
+
+        self.assertEqual(res.status_int, 422)
+
     def test_delete_server_instance_v1_1(self):
         req = webob.Request.blank('/v1.1/servers/1')
         req.method = 'DELETE'