Merge pull request #551 from testing-cabal/move-tests

Move tests out of testtools/

Author: jelmer

.github/workflows/test.yml

@@ -72,7 +72,7 @@ jobs:
 
       - name: Run tests
         run: |
-          python -W once -m testtools.run testtools.tests.test_suite
+          python -W once -m testtools.run tests.test_suite
 
   docs:
     runs-on: ubuntu-latest

.testr.conf

@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=${PYTHON:-python3} -m subunit.run $LISTOPT $IDOPTION testtools.tests.test_suite
+test_command=${PYTHON:-python3} -m subunit.run $LISTOPT $IDOPTION tests.test_suite
 test_id_option=--load-list $IDFILE
 test_list_option=--list

Makefile

@@ -4,7 +4,7 @@ PYTHON=python3
 SOURCES=$(shell find testtools -name "*.py")
 
 check:
-	PYTHONPATH=$(PWD) $(PYTHON) -m testtools.run testtools.tests.test_suite
+	PYTHONPATH=$(PWD) $(PYTHON) -m testtools.run tests.test_suite
 
 TAGS: ${SOURCES}
 	ctags -e -R testtools/

doc/hacking.rst

@@ -103,7 +103,7 @@ Users of testtools should never import a submodule in order to use a stable
 API.  Unstable APIs like ``testtools.matchers`` and
 ``testtools.deferredruntest`` should be exported as submodules.
 
-Tests belong in ``testtools/tests/``.
+Tests belong in ``tests/``.
 
 
 Committing to trunk

pyproject.toml

@@ -78,7 +78,7 @@ ignore_missing_imports = true
 [[tool.mypy.overrides]]
 module = [
     # FIXME(stephenfin): We would like to remove all modules from this list
-    # except testtools.tests (we're not sadists)
+    # except tests (we're not sadists)
     "testtools.assertions",
     "testtools.compat",
     "testtools.content",
@@ -91,7 +91,7 @@ module = [
     "testtools.testresult.*",
     "testtools.testsuite",
     "testtools.twistedsupport.*",
-    "testtools.tests.*",
+    "tests.*",
 ]
 disallow_untyped_calls = false
 disallow_untyped_defs = false

scripts/all-pythons

@@ -31,7 +31,7 @@ ROOT = os.path.dirname(os.path.dirname(__file__))
 
 def run_for_python(version, result, tests):
     if not tests:
-        tests = ['testtools.tests.test_suite']
+        tests = ['tests.test_suite']
     # XXX: This could probably be broken up and put into subunit.
     python = 'python%s' % (version,)
     # XXX: Correct API, but subunit doesn't support it. :(

testtools/tests/__init__.py tests/__init__.pytesttools/tests/__init__.py renamed to tests/__init__.py

@@ -8,7 +8,7 @@
 
 
 def test_suite():
-    from testtools.tests import (
+    from . import (
         matchers,
         test_assert_that,
         test_compat,

testtools/tests/helpers.py tests/helpers.pytesttools/tests/helpers.py renamed to tests/helpers.py

@@ -5,7 +5,7 @@
 
 
 def test_suite():
-    from testtools.tests.matchers import (
+    from ..matchers import (
         test_basic,
         test_const,
         test_datastructures,