Merge "Use assertIsNone() instead of assertEqual(None, xxx)"

Author: Jenkins

openstackclient/tests/network/v2/test_security_group.py

@@ -61,7 +61,7 @@ def test_security_group_delete(self):
 
         self.network.delete_security_group.assert_called_with(
             self._security_group)
-        self.assertEqual(None, result)
+        self.assertIsNone(result)
 
 
 class TestDeleteSecurityGroupCompute(TestSecurityGroup):
@@ -96,4 +96,4 @@ def test_security_group_delete(self):
 
         self.compute.security_groups.delete.assert_called_with(
             self._security_group.id)
-        self.assertEqual(None, result)
+        self.assertIsNone(result)

openstackclient/tests/network/v2/test_security_group_rule.py

@@ -67,7 +67,7 @@ def test_security_group_rule_delete(self):
 
         self.network.delete_security_group_rule.assert_called_with(
             self._security_group_rule)
-        self.assertEqual(None, result)
+        self.assertIsNone(result)
 
 
 class TestDeleteSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
@@ -97,4 +97,4 @@ def test_security_group_rule_delete(self):
 
         self.compute.security_group_rules.delete.assert_called_with(
             self._security_group_rule.id)
-        self.assertEqual(None, result)
+        self.assertIsNone(result)

openstackclient/tests/object/v1/test_container.py

@@ -67,7 +67,7 @@ def test_container_delete(self, c_mock, o_list_mock, o_delete_mock):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertEqual(None, self.cmd.take_action(parsed_args))
+        self.assertIsNone(self.cmd.take_action(parsed_args))
 
         kwargs = {}
         c_mock.assert_called_with(
@@ -92,7 +92,7 @@ def test_recursive_delete(self, c_mock, o_list_mock, o_delete_mock):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertEqual(None, self.cmd.take_action(parsed_args))
+        self.assertIsNone(self.cmd.take_action(parsed_args))
 
         kwargs = {}
         c_mock.assert_called_with(
@@ -120,7 +120,7 @@ def test_r_delete(self, c_mock, o_list_mock, o_delete_mock):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertEqual(None, self.cmd.take_action(parsed_args))
+        self.assertIsNone(self.cmd.take_action(parsed_args))
 
         kwargs = {}
         c_mock.assert_called_with(