Merge "Use assertIsNone() instead of assertEqual(None, xxx)"
This commit is contained in:
		@@ -61,7 +61,7 @@ class TestDeleteSecurityGroupNetwork(TestSecurityGroup):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        self.network.delete_security_group.assert_called_with(
 | 
					        self.network.delete_security_group.assert_called_with(
 | 
				
			||||||
            self._security_group)
 | 
					            self._security_group)
 | 
				
			||||||
        self.assertEqual(None, result)
 | 
					        self.assertIsNone(result)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class TestDeleteSecurityGroupCompute(TestSecurityGroup):
 | 
					class TestDeleteSecurityGroupCompute(TestSecurityGroup):
 | 
				
			||||||
@@ -96,4 +96,4 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroup):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        self.compute.security_groups.delete.assert_called_with(
 | 
					        self.compute.security_groups.delete.assert_called_with(
 | 
				
			||||||
            self._security_group.id)
 | 
					            self._security_group.id)
 | 
				
			||||||
        self.assertEqual(None, result)
 | 
					        self.assertIsNone(result)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,7 +67,7 @@ class TestDeleteSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        self.network.delete_security_group_rule.assert_called_with(
 | 
					        self.network.delete_security_group_rule.assert_called_with(
 | 
				
			||||||
            self._security_group_rule)
 | 
					            self._security_group_rule)
 | 
				
			||||||
        self.assertEqual(None, result)
 | 
					        self.assertIsNone(result)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class TestDeleteSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
 | 
					class TestDeleteSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
 | 
				
			||||||
@@ -97,4 +97,4 @@ class TestDeleteSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        self.compute.security_group_rules.delete.assert_called_with(
 | 
					        self.compute.security_group_rules.delete.assert_called_with(
 | 
				
			||||||
            self._security_group_rule.id)
 | 
					            self._security_group_rule.id)
 | 
				
			||||||
        self.assertEqual(None, result)
 | 
					        self.assertIsNone(result)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,7 +67,7 @@ class TestContainerDelete(TestContainer):
 | 
				
			|||||||
        ]
 | 
					        ]
 | 
				
			||||||
        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 | 
					        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 = {}
 | 
					        kwargs = {}
 | 
				
			||||||
        c_mock.assert_called_with(
 | 
					        c_mock.assert_called_with(
 | 
				
			||||||
@@ -92,7 +92,7 @@ class TestContainerDelete(TestContainer):
 | 
				
			|||||||
        ]
 | 
					        ]
 | 
				
			||||||
        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 | 
					        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 = {}
 | 
					        kwargs = {}
 | 
				
			||||||
        c_mock.assert_called_with(
 | 
					        c_mock.assert_called_with(
 | 
				
			||||||
@@ -120,7 +120,7 @@ class TestContainerDelete(TestContainer):
 | 
				
			|||||||
        ]
 | 
					        ]
 | 
				
			||||||
        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 | 
					        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 = {}
 | 
					        kwargs = {}
 | 
				
			||||||
        c_mock.assert_called_with(
 | 
					        c_mock.assert_called_with(
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user