Test changes

1 files changed, 39 insertions, 43 deletions

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 878b62f85..665551c55 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -26,6 +26,7 @@ from nova import db
 from nova import flags
 import nova.api.openstack
 from nova.api.openstack import servers
+import nova.compute.api
 import nova.db.api
 from nova.db.sqlalchemy.models import Instance
 import nova.rpc
@@ -139,7 +140,7 @@ class ServersTest(unittest.TestCase):
         self.stubs.Set(nova.compute.API, "get_actions", fake_compute_api)
         self.allow_admin = FLAGS.allow_admin_api
 
-        self.webreq = common.webob_factor('/v1.0/servers')
+        self.webreq = common.webob_factory('/v1.0/servers')
 
     def tearDown(self):
         self.stubs.UnsetAll()
@@ -415,98 +416,93 @@ class ServersTest(unittest.TestCase):
         self.assertEqual(self.server_delete_called, True)
 
     def test_resize_server(self):
-        req = self.webreq('/1/action', 'POST', dict(resize={flavorId=3}}))
-        res = req.get_response(fakes.wsgi_app())
+        req = self.webreq('/1/action', 'POST', dict(resize=dict(flavorId=3)))
 
         self.resize_called = False
-        def resize_mock(context, inst_id, flavor):
+        def resize_mock(*args):
             self.resize_called = True 
 
-        self.stubs.Set(nova.compute.api, 'resize_instance', resize_mock)
+        self.stubs.Set(nova.compute.api.API, 'resize', resize_mock)
+
+        res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 202)
         self.assertEqual(self.resize_called, True)
 
-    def test_resize_bad_param_fails(self):
-        req = self.webreq('/1/action', 'POST', dict('ferp'))
-        res = req.get_response(fakes.wsgi_app())
+    def test_resize_bad_flavor_fails(self):
+        req = self.webreq('/1/action', 'POST', dict(resize=dict(derp=3)))
 
         self.resize_called = False
-        def resize_mock(context, inst_id, flavor):
+        def resize_mock(*args):
             self.resize_called = True 
 
-        self.stubs.Set(nova.compute.api, 'resize_instance', resize_mock)
-        self.assertEqual(res.status_int, 422)
-        self.assertEqual(self.resize_called, False)
+        self.stubs.Set(nova.compute.api.API, 'resize', resize_mock)
 
-    def test_resize_bad_flavor_fails(self):
-        req = self.webreq('/1/action', 'POST', dict(resize={derp=3}))
         res = req.get_response(fakes.wsgi_app())
-
-        self.resize_called = False
-        def resize_mock(context, inst_id, flavor):
-            self.resize_called = True 
-
-        self.stubs.Set(nova.compute.api, 'resize_instance', resize_mock)
         self.assertEqual(res.status_int, 422)
         self.assertEqual(self.resize_called, False)
 
     def test_resize_raises_fails(self):
-        req = self.webreq('/1/action', 'POST', dict(resize={flavorId=3}))
-        res = req.get_response(fakes.wsgi_app())
+        req = self.webreq('/1/action', 'POST', dict(resize=dict(flavorId=3)))
 
-        def resize_mock(context, inst_id, flavor):
+        def resize_mock(*args):
             raise Exception, 'hurr durr'
 
-        self.stubs.Set(nova.compute.api, 'resize_instance', resize_mock)
-        self.assertEqual(res.status_int, 500)
+        self.stubs.Set(nova.compute.api.API, 'resize', resize_mock)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 400)
 
     def test_confirm_resize_server(self):
         req = self.webreq('/1/action', 'POST', dict(confirmResize=None))
-        res = req.get_response(fakes.wsgi_app())
 
         self.resize_called = False
-        def confirm_resize_mock(context, inst_id):
+        def confirm_resize_mock(*args):
             self.resize_called = True 
 
-        self.stubs.Set(nova.compute.api, 'confirm_resize', 
+        self.stubs.Set(nova.compute.api.API, 'confirm_resize', 
                 confirm_resize_mock)
-        self.assertEqual(res.status_int, 202)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 204)
         self.assertEqual(self.resize_called, True)
 
     def test_confirm_resize_server_fails(self):
         req = self.webreq('/1/action', 'POST', dict(confirmResize=None))
-        res = req.get_response(fakes.wsgi_app())
 
-        def confirm_resize_mock(context, inst_id):
+        def confirm_resize_mock(*args):
             raise Exception, 'hurr durr'
 
-        self.stubs.Set(nova.compute.api, 'confirm_resize', 
+        self.stubs.Set(nova.compute.api.API, 'confirm_resize', 
                 confirm_resize_mock)
-        self.assertEqual(res.status_int, 500)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 400)
 
     def test_revert_resize_server(self):
         req = self.webreq('/1/action', 'POST', dict(revertResize=None))
-        res = req.get_response(fakes.wsgi_app())
 
         self.resize_called = False
-        def revert_resize_mock(context, inst_id):
+        def revert_resize_mock(*args):
             self.resize_called = True
 
-        self.stubs.Set(nova.compute.api, 'revert_resize', 
-                confirm_resize_mock)
+        self.stubs.Set(nova.compute.api.API, 'revert_resize', 
+                revert_resize_mock)
+
+        res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 202)
         self.assertEqual(self.resize_called, True)
 
     def test_revert_resize_server_fails(self):
-        req = self.webreq('/1/action', 'POST', dict(confirmResize=None))
-        res = req.get_response(fakes.wsgi_app())
+        req = self.webreq('/1/action', 'POST', dict(revertResize=None))
 
-        def revert_resize_mock(context, inst_id):
+        def revert_resize_mock(*args):
             raise Exception, 'hurr durr'
 
-        self.stubs.Set(nova.compute.api, 'revert_resize', 
-                confirm_resize_mock)
-        self.assertEqual(res.status_int, 500)
+        self.stubs.Set(nova.compute.api.API, 'revert_resize', 
+                revert_resize_mock)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 400)
 
 if __name__ == "__main__":
     unittest.main()