From 7004ccc441f700692b95dba89f8d3c4f30f2ca18 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 5 Feb 2015 22:04:44 +0100 Subject: [PATCH] Implement TestCase.assertIsNotNone for python < 2.7. Change-Id: Ieaefdc77495e27bad791075d985a70908e9be1ad Signed-off-by: Jelmer Vernooij Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Mar 6 07:11:43 CET 2015 on sn-devel-104 --- python/samba/tests/__init__.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index 840e5c36285..3e7094fe067 100644 --- a/python/samba/tests/__init__.py +++ b/python/samba/tests/__init__.py @@ -64,14 +64,17 @@ class TestCase(unittest.TestCase): def assertIn(self, member, container, msg=None): self.assertTrue(member in container, msg) - def assertIs(self, a, b): - self.assertTrue(a is b) + def assertIs(self, a, b, msg=None): + self.assertTrue(a is b, msg) - def assertIsNot(self, a, b): - self.assertTrue(a is not b) + def assertIsNot(self, a, b, msg=None): + self.assertTrue(a is not b, msg) - def assertIsInstance(self, a, b): - self.assertTrue(isinstance(a, b)) + def assertIsNotNone(self, a, msg=None): + self.assertTrue(a is not None) + + def assertIsInstance(self, a, b, msg=None): + self.assertTrue(isinstance(a, b), msg) def assertIsNone(self, a, msg=None): self.assertTrue(a is None, msg)