From 5e5cc3260f814831ed2860aed485647dddbd7e39 Mon Sep 17 00:00:00 2001 From: Shuquan Huang Date: Thu, 17 Dec 2015 22:12:10 +0800 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: I40c4d43673d5643a4e4cd50fd6abe21559222749 Closes-bug: #1280522 --- .../unittests/secgroups/test_security_group.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/trove/tests/unittests/secgroups/test_security_group.py b/trove/tests/unittests/secgroups/test_security_group.py index 049940de5c..83ca111b98 100644 --- a/trove/tests/unittests/secgroups/test_security_group.py +++ b/trove/tests/unittests/secgroups/test_security_group.py @@ -133,9 +133,9 @@ class SecurityGroupDeleteTest(trove_testtools.TestCase): def test_failed_to_get_assoc_on_delete(self): sec_mod.SecurityGroupInstanceAssociation.find_by = self.fException - self.assertEqual(None, - sec_mod.SecurityGroup.delete_for_instance( - uuid.uuid4(), self.context)) + self.assertIsNone( + sec_mod.SecurityGroup.delete_for_instance( + uuid.uuid4(), self.context)) def test_get_security_group_from_assoc_with_db_exception(self): @@ -154,9 +154,9 @@ class SecurityGroupDeleteTest(trove_testtools.TestCase): sec_mod.SecurityGroupInstanceAssociation.find_by = Mock( return_value=new_fake_RemoteSecGrAssoc()) - self.assertEqual(None, - sec_mod.SecurityGroup.delete_for_instance( - i_id, self.context)) + self.assertIsNone( + sec_mod.SecurityGroup.delete_for_instance( + i_id, self.context)) def test_delete_secgr_assoc_with_db_exception(self): @@ -169,6 +169,6 @@ class SecurityGroupDeleteTest(trove_testtools.TestCase): self.assertTrue(hasattr(sec_mod.SecurityGroupInstanceAssociation. find_by(i_id, deleted=False). get_security_group(), 'delete')) - self.assertEqual(None, - sec_mod.SecurityGroup.delete_for_instance( - i_id, self.context)) + self.assertIsNone( + sec_mod.SecurityGroup.delete_for_instance( + i_id, self.context))