From 6d1b72ee77294401ad51230a671ae16c5eff8030 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Sat, 18 Jan 2014 00:11:53 +0900 Subject: [PATCH] Fix the test parameter order for v3 evacuate test On assertEqual(), the order of parameters should be "expected" and "observed". However the parameters of some evacuate tests are invalid. This patch fixes them. Change-Id: I7ee48ef87082301f7f4ea0633b39275847cbd7e1 --- .../compute/plugins/v3/test_evacuate.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py index 6d0abdcbe4..35e633cf75 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py @@ -87,13 +87,13 @@ class EvacuateTest(test.NoDBTestCase): req, app = self._gen_request_with_app({'on_shared_storage': 'False', 'admin_password': 'MyNewPass'}) res = req.get_response(app) - self.assertEqual(res.status_int, 400) + self.assertEqual(400, res.status_int) def test_evacuate_instance_without_on_shared_storage(self): req, app = self._gen_request_with_app({'host': 'my-host', 'admin_password': 'MyNewPass'}) res = req.get_response(app) - self.assertEqual(res.status_int, 400) + self.assertEqual(400, res.status_int) def test_evacuate_instance_with_bad_host(self): req, app = self._gen_request_with_app({'host': 'bad-host', @@ -101,7 +101,7 @@ class EvacuateTest(test.NoDBTestCase): 'admin_password': 'MyNewPass'}) res = req.get_response(app) - self.assertEqual(res.status_int, 404) + self.assertEqual(404, res.status_int) def test_evacuate_instance_with_target(self): req, app = self._gen_request_with_app({'host': 'my-host', @@ -111,7 +111,7 @@ class EvacuateTest(test.NoDBTestCase): self.stubs.Set(compute_api.API, 'update', self._fake_update) resp = req.get_response(app) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) resp_json = jsonutils.loads(resp.body) self.assertEqual("MyNewPass", resp_json['admin_password']) @@ -126,7 +126,7 @@ class EvacuateTest(test.NoDBTestCase): self.stubs.Set(compute_api.API, 'update', self._fake_update) resp = req.get_response(app) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) resp_json = jsonutils.loads(resp.body) self.assertEqual("MyNewPass", resp_json['admin_password']) @@ -137,7 +137,7 @@ class EvacuateTest(test.NoDBTestCase): self.stubs.Set(compute_api.API, 'update', self._fake_update) res = req.get_response(app) - self.assertEqual(res.status_int, 400) + self.assertEqual(400, res.status_int) def test_evacuate_not_shared_pass_generated(self): req, app = self._gen_request_with_app({'host': 'my-host', @@ -146,7 +146,7 @@ class EvacuateTest(test.NoDBTestCase): self.stubs.Set(compute_api.API, 'update', self._fake_update) resp = req.get_response(app) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) resp_json = jsonutils.loads(resp.body) self.assertEqual(CONF.password_length, len(resp_json['admin_password'])) @@ -157,7 +157,7 @@ class EvacuateTest(test.NoDBTestCase): self.stubs.Set(compute_api.API, 'update', self._fake_update) res = req.get_response(app) - self.assertEqual(res.status_int, 200) + self.assertEqual(200, res.status_int) resp_json = jsonutils.loads(res.body) self.assertIsNone(resp_json['admin_password']) @@ -172,7 +172,7 @@ class EvacuateTest(test.NoDBTestCase): self.stubs.Set(compute_api.API, 'evacuate', fake_evacuate) res = req.get_response(app) - self.assertEqual(res.status_int, 400) + self.assertEqual(400, res.status_int) def test_not_admin(self): req, app = self._gen_request_with_app({'host': 'my-host', @@ -181,4 +181,4 @@ class EvacuateTest(test.NoDBTestCase): req.content_type = 'application/json' res = req.get_response(app) - self.assertEqual(res.status_int, 403) + self.assertEqual(403, res.status_int)