Backport more missing unittest functions to py2.6

Author: jquast

tests/accessories.py

@@ -15,7 +15,7 @@ def norm_file(fname):
 
 
 class TestCaseBackport(unittest.TestCase):
-    """Backport assertRaises and assertIn for python2.5 and 2.6."""
+    """Backport python2.7 TestCase methods (in leiu of unittest2, or better, pytest)."""
     if sys.version_info < (2, 7):
 
         def assertIn(self, member, container, msg=None):
@@ -25,6 +25,21 @@ def assertIn(self, member, container, msg=None):
                                                       safe_repr(container))
                 self.fail(self._formatMessage(msg, standardMsg))
 
+        def assertIs(self, expr1, expr2, msg=None):
+            """Just like self.assertTrue(a is b), but with a nicer default message."""
+            if expr1 is not expr2:
+                standardMsg = '%s is not %s' % (safe_repr(expr1),
+                                                 safe_repr(expr2))
+                self.fail(self._formatMessage(msg, standardMsg))
+
+
+        def assertIsInstance(self, obj, cls, msg=None):
+            """Same as self.assertTrue(isinstance(obj, cls)), with a nicer
+            default message."""
+            if not isinstance(obj, cls):
+                standardMsg = '%s is not an instance of %r' % (safe_repr(obj), cls)
+                self.fail(self._formatMessage(msg, standardMsg))
+
         @contextlib.contextmanager
         def assertRaises(self, excClass):
             try:

tests/test_onimport.py

@@ -4,7 +4,7 @@
 from accessories import TestCaseBackport
 
 
-class SqliteDict_cPickleImportTest(unittest.TestCase):
+class SqliteDict_cPickleImportTest(TestCaseBackport):
     """Verify fallback to 'pickle' module when 'cPickle' is not found."""
     def setUp(self):
         self.orig_meta_path = sys.meta_path
@@ -15,7 +15,6 @@ def __init__(self, *args):
                 self.module_names = args
 
             def find_module(self, fullname, path=None):
-                print(fullname)
                 if fullname in self.module_names:
                     return self
                 return None

tests/test_temp_db.py

@@ -1,10 +1,12 @@
 import unittest
 import sqlitedict
 
+from accessories import TestCaseBackport
+
 from sys import version_info
 _major_version=version_info[0]
 
-class TempSqliteDictTest(unittest.TestCase):
+class TempSqliteDictTest(TestCaseBackport):
 
     def setUp(self):
         self.d = sqlitedict.SqliteDict()