Stop installing tests

Author: jelmer

Makefile

@@ -3,15 +3,15 @@ PYTHON ?= python3
 all: check
 
 check:
-	$(PYTHON) -m testtools.run fixtures.test_suite
+	$(PYTHON) -m testtools.run tests.test_suite
 
 clean:
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
 
-TAGS: fixtures/*.py fixtures/tests/*.py
-	ctags -e -R fixtures/
+TAGS: fixtures/*.py tests/*.py
+	ctags -e -R fixtures/ tests/
 
-tags: fixtures/*.py fixtures/tests/*.py
-	ctags -R fixtures/
+tags: fixtures/*.py tests/*.py
+	ctags -R fixtures/ tests/
 
 .PHONY: all check clean

fixtures/__init__.py

@@ -25,9 +25,6 @@
 Most users will want to look at TestWithFixtures and Fixture, to start with.
 """
 
-from typing import Any
-import unittest
-
 from fixtures._version import __version__
 
 __all__ = [
@@ -101,16 +98,3 @@
     WarningsFilter,
 )
 from fixtures.testcase import TestWithFixtures  # noqa: E402
-
-
-def test_suite() -> unittest.TestSuite:
-    import fixtures.tests  # noqa: F401
-
-    return fixtures.tests.test_suite()
-
-
-def load_tests(
-    loader: unittest.TestLoader, standard_tests: unittest.TestSuite, pattern: Any
-) -> unittest.TestSuite:
-    standard_tests.addTests(loader.loadTestsFromNames(["fixtures.tests"]))
-    return standard_tests

fixtures/_fixtures/streams.py

@@ -59,7 +59,8 @@ def _setUp(self) -> None:
         write_stream, read_stream = self._stream_factory()
         self.stream = write_stream
         self.addDetail(
-            self._detail_name, content_from_stream(read_stream, seek_offset=0)
+            self._detail_name,
+            content_from_stream(read_stream, seek_offset=0),  # type: ignore[no-untyped-call]
         )
 
 

fixtures/fixture.py

@@ -35,6 +35,7 @@
     Tuple,
     TypeVar,
     TYPE_CHECKING,
+    Union,
 )
 
 from fixtures.callmany import (
@@ -51,9 +52,11 @@
 
 MultipleExceptions = fixtures.callmany.MultipleExceptions  # type: ignore[attr-defined]
 
-
+gather_details: Union[Callable[[Dict[str, Any], Dict[str, Any]], None], None]
 try:
-    from testtools.testcase import gather_details
+    from testtools.testcase import gather_details as _gather_details
+
+    gather_details = _gather_details
 except ImportError:
     gather_details = None
 

fixtures/testcase.py

@@ -23,7 +23,7 @@
 from fixtures.fixture import Fixture
 import fixtures.fixture
 
-gather_details = fixtures.fixture.gather_details  # type: ignore[attr-defined]
+gather_details = fixtures.fixture.gather_details
 
 T = TypeVar("T", bound=Fixture)
 
@@ -52,15 +52,23 @@ def useFixture(self, fixture: T) -> T:
         try:
             fixture.setUp()
         except:
-            if use_details:
+            if gather_details is not None and use_details:
                 # Capture the details now, in case the fixture goes away.
-                gather_details(fixture.getDetails(), self.getDetails())  # type: ignore[attr-defined]
+                get_details = getattr(self, "getDetails", None)
+                if get_details is not None:
+                    gather_details(fixture.getDetails(), get_details())
             raise
         else:
             self.addCleanup(fixture.cleanUp)
-            if use_details:
+            if gather_details is not None and use_details:
                 # Capture the details from the fixture during test teardown;
                 # this will evaluate the details before tearing down the
                 # fixture.
-                self.addCleanup(gather_details, fixture, self)
+                def cleanup_details() -> None:
+                    if gather_details is not None:
+                        get_details = getattr(self, "getDetails", None)
+                        if get_details is not None:
+                            gather_details(fixture.getDetails(), get_details())
+
+                self.addCleanup(cleanup_details)
             return fixture

pyproject.toml

@@ -74,8 +74,3 @@ warn_unused_ignores = true
 warn_no_return = true
 warn_unreachable = true
 strict_equality = true
-
-# Disable strict checking for tests
-[[tool.mypy.overrides]]
-module = "fixtures.tests.*"
-ignore_errors = true

fixtures/tests/__init__.py tests/__init__.pyfixtures/tests/__init__.py renamed to tests/__init__.py

@@ -34,10 +34,10 @@ def load_tests(
         "fixture",
         "testcase",
     ]
-    prefix = "fixtures.tests.test_"
+    prefix = "tests.test_"
     test_mod_names = [prefix + test_module for test_module in test_modules]
     standard_tests.addTests(loader.loadTestsFromNames(test_mod_names))
-    standard_tests.addTests(loader.loadTestsFromName("fixtures.tests._fixtures"))
+    standard_tests.addTests(loader.loadTestsFromName("tests._fixtures"))
     doctest.set_unittest_reportflags(doctest.REPORT_ONLY_FIRST_FAILURE)
-    standard_tests.addTest(doctest.DocFileSuite("../../README.rst"))
+    standard_tests.addTest(doctest.DocFileSuite("../README.rst"))
     return standard_tests

fixtures/tests/_fixtures/__init__.py tests/_fixtures/__init__.pyfixtures/tests/_fixtures/__init__.py renamed to tests/_fixtures/__init__.py

@@ -22,7 +22,7 @@ def load_tests(loader, standard_tests, pattern):
         for path in os.listdir(os.path.dirname(__file__))
         if path.startswith("test_")
     ]
-    prefix = "fixtures.tests._fixtures."
+    prefix = "tests._fixtures."
     test_mod_names = [prefix + test_module for test_module in test_modules]
     standard_tests.addTests(loader.loadTestsFromNames(test_mod_names))
     return standard_tests