Merged ned/coveragepy into default

1 files changed, 22 insertions, 7 deletions

diff --git a/tests/backunittest.py b/tests/backunittest.py
index ca741d37..6498397f 100644
--- a/tests/backunittest.py
+++ b/tests/backunittest.py
@@ -8,9 +8,9 @@ except ImportError:
     import unittest
 
 
-def _need(method):
-    """Do we need to define our own `method` method?"""
-    return not hasattr(unittest.TestCase, method)
+def unittest_has(method):
+    """Does `unitttest.TestCase` have `method` defined?"""
+    return hasattr(unittest.TestCase, method)
 
 
 class TestCase(unittest.TestCase):
@@ -20,7 +20,22 @@ class TestCase(unittest.TestCase):
     `unittest` doesn't have them.
 
     """
-    if _need('assertSameElements'):
-        def assertSameElements(self, s1, s2):
-            """Assert that the two arguments are equal as sets."""
-            self.assertEqual(set(s1), set(s2))
+    # pylint: disable=missing-docstring
+
+    if not unittest_has('assertCountEqual'):
+        if unittest_has('assertSameElements'):
+            def assertCountEqual(self, *args, **kwargs):
+                # pylint: disable=no-member
+                return self.assertSameElements(*args, **kwargs)
+        else:
+            def assertCountEqual(self, s1, s2):
+                """Assert these have the same elements, regardless of order."""
+                self.assertEqual(set(s1), set(s2))
+
+    if not unittest_has('assertRaisesRegex'):
+        def assertRaisesRegex(self, *args, **kwargs):
+            return self.assertRaisesRegexp(*args, **kwargs)
+
+    if not unittest_has('assertRegex'):
+        def assertRegex(self, *args, **kwargs):
+            return self.assertRegexpMatches(*args, **kwargs)