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

jelmer · web-flow · commit 48b310cb5ece · 2026-05-22T11:25:27.000+01:00
Move tests to root
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -66,7 +66,7 @@ jobs:
 
       - name: Run tests
         run: |
-          python -W once -m testtools.run testscenarios.tests.test_suite
+          python -W once -m testtools.run testscenarios.test_suite
 
   success:
     needs: ["lint", "test"]
diff --git a/Makefile b/Makefile
@@ -10,10 +10,10 @@ check:
 clean:
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
 
-TAGS: testscenarios/*.py testscenarios/tests/*.py
-	ctags -e -R testscenarios/
+TAGS: testscenarios/*.py tests/*.py
+	ctags -e -R testscenarios/ tests/
 
-tags: testscenarios/*.py testscenarios/tests/*.py
-	ctags -R testscenarios/
+tags: testscenarios/*.py tests/*.py
+	ctags -R testscenarios/ tests/
 
 .PHONY: all check
diff --git a/NEWS b/NEWS
@@ -5,6 +5,16 @@ testscenarios release notes
 IN DEVELOPMENT
 ~~~~~~~~~~~~~~
 
+CHANGES
+-------
+
+* The test suite has moved from ``testscenarios/tests`` to a top-level
+  ``tests`` directory, so it is no longer installed as part of the wheel.
+  (#28)
+
+* Require testtools >= 2.8.7, the first release in which ``iterate_tests``
+  again accepts plain lists.
+
 0.6.1
 ~~~~~
 
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-testtools
+testtools >= 2.8.7
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -31,11 +31,11 @@ def load_tests(loader, standard_tests, pattern):
         "testcase",
         "scenarios",
     ]
-    prefix = "testscenarios.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))
     doctest.set_unittest_reportflags(doctest.REPORT_ONLY_FIRST_FAILURE)
     standard_tests.addTest(
-        doctest.DocFileSuite("../../README.rst", optionflags=doctest.ELLIPSIS)
+        doctest.DocFileSuite("../README.rst", optionflags=doctest.ELLIPSIS)
     )
     return loader.suiteClass(testscenarios.generate_scenarios(standard_tests))
diff --git a/tests/test_scenarios.py b/tests/test_scenarios.py
diff --git a/tests/test_testcase.py b/tests/test_testcase.py
diff --git a/testscenarios/__init__.py b/testscenarios/__init__.py
@@ -52,13 +52,13 @@
 
 
 def test_suite():
-    import testscenarios.tests  # noqa: F401
+    import tests  # noqa: F401
 
-    return testscenarios.tests.test_suite()
+    return tests.test_suite()
 
 
 def load_tests(loader, standard_tests, pattern):
-    standard_tests.addTests(loader.loadTestsFromNames(["testscenarios.tests"]))
+    standard_tests.addTests(loader.loadTestsFromNames(["tests"]))
     return standard_tests
 
 

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ def load_tests(loader, standard_tests, pattern):`
`31`	`31`	`"testcase",`
`32`	`32`	`"scenarios",`
`33`	`33`	`]`
`34`		`- prefix = "testscenarios.tests.test_"`
	`34`	`+ prefix = "tests.test_"`
`35`	`35`	`test_mod_names = [prefix + test_module for test_module in test_modules]`
`36`	`36`	`standard_tests.addTests(loader.loadTestsFromNames(test_mod_names))`
`37`	`37`	`doctest.set_unittest_reportflags(doctest.REPORT_ONLY_FIRST_FAILURE)`
`38`	`38`	`standard_tests.addTest(`
`39`		`- doctest.DocFileSuite("../../README.rst", optionflags=doctest.ELLIPSIS)`
	`39`	`+ doctest.DocFileSuite("../README.rst", optionflags=doctest.ELLIPSIS)`
`40`	`40`	`)`
`41`	`41`	`return loader.suiteClass(testscenarios.generate_scenarios(standard_tests))`