Using assertIsNone() instead of assertEqual(None)

Following OpenStack Style Guidelines:
[1] http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises
[H203] Unit test assertions tend to give better messages for more specific
assertions. As a result, assertIsNone(...) is preferred over
assertEqual(None, ...) and assertIs(..., None)

Change-Id: I6c43e4618d972c7c8b3925df6532c8b67930fdd7
This commit is contained in:
lingyongxu 2017-08-22 10:29:19 +08:00
parent 6097e397fb
commit de3df0f2c4

View File

@ -362,17 +362,17 @@ class LinuxNetTest(testtools.TestCase):
self.assertEqual(linux_net._parse_vf_number("0"), "0") self.assertEqual(linux_net._parse_vf_number("0"), "0")
self.assertEqual(linux_net._parse_vf_number("pf13vf42"), "42") self.assertEqual(linux_net._parse_vf_number("pf13vf42"), "42")
self.assertEqual(linux_net._parse_vf_number("VF19@PF13"), "19") self.assertEqual(linux_net._parse_vf_number("VF19@PF13"), "19")
self.assertEqual(linux_net._parse_vf_number("p7"), None) self.assertIsNone(linux_net._parse_vf_number("p7"))
self.assertEqual(linux_net._parse_vf_number("pf31"), None) self.assertIsNone(linux_net._parse_vf_number("pf31"))
self.assertEqual(linux_net._parse_vf_number("g4rbl3d"), None) self.assertIsNone(linux_net._parse_vf_number("g4rbl3d"))
def test_parse_pf_number(self): def test_parse_pf_number(self):
self.assertEqual(linux_net._parse_pf_number("0"), None) self.assertIsNone(linux_net._parse_pf_number("0"))
self.assertEqual(linux_net._parse_pf_number("pf13vf42"), "13") self.assertEqual(linux_net._parse_pf_number("pf13vf42"), "13")
self.assertEqual(linux_net._parse_pf_number("VF19@PF13"), "13") self.assertEqual(linux_net._parse_pf_number("VF19@PF13"), "13")
self.assertEqual(linux_net._parse_pf_number("p7"), None) self.assertIsNone(linux_net._parse_pf_number("p7"))
self.assertEqual(linux_net._parse_pf_number("pf31"), "31") self.assertEqual(linux_net._parse_pf_number("pf31"), "31")
self.assertEqual(linux_net._parse_pf_number("g4rbl3d"), None) self.assertIsNone(linux_net._parse_pf_number("g4rbl3d"))
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@mock.patch.object(os.path, 'isfile') @mock.patch.object(os.path, 'isfile')