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 306ba5195f..5216a2dc68 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py @@ -87,7 +87,7 @@ 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_with_empty_host(self): req, app = self._gen_request_with_app({'host': '', @@ -127,7 +127,7 @@ class EvacuateTest(test.NoDBTestCase): 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', @@ -135,7 +135,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', @@ -145,7 +145,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']) @@ -160,7 +160,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']) @@ -171,7 +171,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', @@ -180,7 +180,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'])) @@ -191,7 +191,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']) @@ -206,7 +206,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', @@ -215,4 +215,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)