Merge pull request #566 from stephenfin/restore-compat-helpers

Re-add removed helpers

Author: jelmer

pyproject.toml

@@ -82,6 +82,8 @@ module = [
     # except tests (we're not sadists)
     "testtools.twistedsupport.*",
     "tests.*",
+    # NOTE(stephenfin): These are deprecated so we're not going to type them
+    "testtools.tests.helpers",
 ]
 disallow_untyped_calls = false
 disallow_untyped_defs = false

tests/matchers/test_basic.py

@@ -24,9 +24,9 @@
     _BinaryMismatch,
     _NotNearlyEqual,
 )
+from testtools.matchers.test import TestMatchersInterface
 
 from ..helpers import FullStackRunTest
-from ..matchers.helpers import TestMatchersInterface
 
 
 class Test_BinaryMismatch(TestCase):

tests/matchers/test_const.py

@@ -4,8 +4,7 @@
 
 from testtools import TestCase
 from testtools.matchers import Always, Never
-
-from ..matchers.helpers import TestMatchersInterface
+from testtools.matchers.test import TestMatchersInterface
 
 
 class TestAlwaysInterface(TestMatchersInterface, TestCase):

tests/matchers/test_datastructures.py

@@ -20,9 +20,9 @@
     MatchesSetwise,
     MatchesStructure,
 )
+from testtools.matchers.test import TestMatchersInterface
 
 from ..helpers import FullStackRunTest
-from ..matchers.helpers import TestMatchersInterface
 
 
 def run_doctest(obj, name):

tests/matchers/test_dict.py

@@ -14,8 +14,7 @@
     MatchesDict,
     _SubDictOf,
 )
-
-from ..matchers.helpers import TestMatchersInterface
+from testtools.matchers.test import TestMatchersInterface
 
 
 class TestMatchesAllDictInterface(TestCase, TestMatchersInterface):

tests/matchers/test_doctest.py

@@ -5,9 +5,9 @@
 
 from testtools import TestCase
 from testtools.matchers._doctest import DocTestMatches
+from testtools.matchers.test import TestMatchersInterface
 
 from ..helpers import FullStackRunTest
-from ..matchers.helpers import TestMatchersInterface
 
 
 class TestDocTestMatchesInterface(TestCase, TestMatchersInterface):

tests/matchers/test_exception.py

@@ -13,9 +13,9 @@
     Raises,
     raises,
 )
+from testtools.matchers.test import TestMatchersInterface
 
 from ..helpers import FullStackRunTest
-from ..matchers.helpers import TestMatchersInterface
 
 
 def make_error(type, *args, **kwargs):

tests/matchers/test_higherorder.py

@@ -23,9 +23,9 @@
     MatchesPredicateWithParams,
     Not,
 )
+from testtools.matchers.test import TestMatchersInterface
 
 from ..helpers import FullStackRunTest
-from ..matchers.helpers import TestMatchersInterface
 
 
 class TestAllMatch(TestCase, TestMatchersInterface):

tests/matchers/test_warnings.py

@@ -13,9 +13,9 @@
     MatchesStructure,
 )
 from testtools.matchers._warnings import IsDeprecated, WarningMessage, Warnings
+from testtools.matchers.test import TestMatchersInterface
 
 from ..helpers import FullStackRunTest
-from ..matchers.helpers import TestMatchersInterface
 
 
 def make_warning(warning_type, message):

tests/test_compat.py

@@ -5,9 +5,11 @@
 import ast
 import io
 import sys
+import traceback
 
 import testtools
 from testtools.compat import (
+    reraise,
     text_repr,
     unicode_output_stream,
 )
@@ -216,6 +218,43 @@ def test_unicode_examples_multiline(self):
             self.assertEqual(ast.literal_eval(actual), u)
 
 
+class TestReraise(testtools.TestCase):
+    """Tests for trivial reraise wrapper needed for Python 2/3 changes"""
+
+    def test_exc_info(self):
+        """After reraise exc_info matches plus some extra traceback"""
+        try:
+            raise ValueError("Bad value")
+        except ValueError:
+            _exc_info = sys.exc_info()
+        try:
+            reraise(*_exc_info)
+        except ValueError:
+            _new_exc_info = sys.exc_info()
+        self.assertIs(_exc_info[0], _new_exc_info[0])
+        self.assertIs(_exc_info[1], _new_exc_info[1])
+        expected_tb = traceback.extract_tb(_exc_info[2])
+        self.assertEqual(
+            expected_tb, traceback.extract_tb(_new_exc_info[2])[-len(expected_tb) :]
+        )
+
+    def test_custom_exception_no_args(self):
+        """Reraising does not require args attribute to contain params"""
+
+        class CustomException(Exception):
+            """Exception that expects and sets attrs but not args"""
+
+            def __init__(self, value):
+                Exception.__init__(self)
+                self.value = value
+
+        try:
+            raise CustomException("Some value")
+        except CustomException:
+            _exc_info = sys.exc_info()
+        self.assertRaises(CustomException, reraise, *_exc_info)
+
+
 def test_suite():
     from unittest import TestLoader