Skip to content

Move tests to root #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jelmer merged 2 commits into from
May 22, 2026
Merged

Move tests to root #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42e820a
Move test suite out of the installed package
jelmer May 22, 2026
47910e6
Bump testtools version
jelmer May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
testtools
testtools >= 2.8.7
4 changes: 2 additions & 2 deletions testscenarios/tests/__init__.py → tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
0 testscenarios/tests/test_scenarios.py → tests/test_scenarios.py
View file
Open in desktop
File renamed without changes.
0 testscenarios/tests/test_testcase.py → tests/test_testcase.py
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions testscenarios/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down