From a2f2a0cf7fc7a833530621081ebc7bfdb3dad4ab Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Mon, 4 Jan 2016 19:16:38 +0530 Subject: [PATCH] Replace assertEqual(None, *) with assertIsNone in tests Replace assertEqual(None, *) with assertIsNone in tests to have more clear messages in case of failure. Change-Id: If621271421faeb5a19bba09534a6770bbfdccc5f Partial-bug: #1280522 --- ooi/tests/controllers/test_helpers.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ooi/tests/controllers/test_helpers.py b/ooi/tests/controllers/test_helpers.py index b444766..7bdd422 100644 --- a/ooi/tests/controllers/test_helpers.py +++ b/ooi/tests/controllers/test_helpers.py @@ -385,7 +385,7 @@ class TestOpenStackHelper(TestBaseHelper): m.return_value = req_mock server_uuid = uuid.uuid4().hex ret = self.helper.delete(None, server_uuid) - self.assertEqual(None, ret) + self.assertIsNone(ret) m.assert_called_with(None, server_uuid) @mock.patch("ooi.api.helpers.exception_from_response") @@ -413,7 +413,7 @@ class TestOpenStackHelper(TestBaseHelper): m.return_value = req_mock vol_uuid = uuid.uuid4().hex ret = self.helper.volume_delete(None, vol_uuid) - self.assertEqual(None, ret) + self.assertIsNone(ret) m.assert_called_with(None, vol_uuid) @mock.patch("ooi.api.helpers.exception_from_response") @@ -442,7 +442,7 @@ class TestOpenStackHelper(TestBaseHelper): server_uuid = uuid.uuid4().hex action = "start" ret = self.helper.run_action(None, action, server_uuid) - self.assertEqual(None, ret) + self.assertIsNone(ret) m.assert_called_with(None, action, server_uuid) @mock.patch("ooi.api.helpers.exception_from_response") @@ -732,7 +732,7 @@ class TestOpenStackHelper(TestBaseHelper): ret = self.helper.delete_server_volumes_link(None, server_uuid, vol_uuid) - self.assertEqual(None, ret) + self.assertIsNone(ret) m.assert_called_with(None, server_uuid, vol_uuid) @mock.patch.object(helpers.OpenStackHelper, @@ -772,7 +772,7 @@ class TestOpenStackHelper(TestBaseHelper): m.return_value = req_mock ip_uuid = uuid.uuid4().hex ret = self.helper.release_floating_ip(None, ip_uuid) - self.assertEqual(None, ret) + self.assertIsNone(ret) m.assert_called_with(None, ip_uuid) @mock.patch.object(helpers.OpenStackHelper, "_get_floating_ip_release_req") @@ -799,7 +799,7 @@ class TestOpenStackHelper(TestBaseHelper): ip = "192.168.0.20" server = uuid.uuid4().hex ret = self.helper.associate_floating_ip(None, server, ip) - self.assertEqual(None, ret) + self.assertIsNone(ret) m.assert_called_with(None, server, ip) @mock.patch.object(helpers.OpenStackHelper, "_get_remove_floating_ip_req") @@ -811,7 +811,7 @@ class TestOpenStackHelper(TestBaseHelper): ip = "192.168.0.20" server = uuid.uuid4().hex ret = self.helper.remove_floating_ip(None, server, ip) - self.assertEqual(None, ret) + self.assertIsNone(ret) m.assert_called_with(None, server, ip) @mock.patch.object(helpers.OpenStackHelper, "_get_remove_floating_ip_req")