Implement TestCase.assertIsNotNone for python < 2.7.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 5 Feb 2015 21:04:44 +0000 (22:04 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 6 Mar 2015 06:11:43 +0000 (07:11 +0100)
Change-Id: Ieaefdc77495e27bad791075d985a70908e9be1ad
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Mar  6 07:11:43 CET 2015 on sn-devel-104

python/samba/tests/__init__.py

index 840e5c36285b8300dccfe7772b0511104b48a28e..3e7094fe067f1cef5f138685b3b64e7b9e0e0880 100644 (file)
@@ -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)