Skip to content

Commit 01fd6cf

Browse files
jelmerjelmer
authored
Merge pull request #100 from testing-cabal/move-tests
Stop installing tests
2 parents ee805a9 + 3ccd840 commit 01fd6cf

26 files changed

+53
-35
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,6 @@ perl/MYMETA.json
5959
python/python_subunit.egg-info/
6060
test-driver
6161
ar-lib
62+
*.o
63+
*.log
64+
*.trs

‎COPYING‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ Code that has been incorporated into Subunit from other projects will
2929
naturally be under its own license, and will retain that license.
3030

3131
A known list of such code is maintained here:
32-
* The runtests.py and python/subunit/tests/TestUtil.py module are GPL test
32+
* The runtests.py and python/tests/TestUtil.py module are GPL test
3333
support modules. They are not installed by Subunit - they are only ever
3434
used on the build machine. Copyright 2004 Canonical Limited.

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ exclude py-compile
1818
prune shell
1919
exclude stamp-h1
2020
include NEWS
21+
recursive-include python/tests *.py

‎Makefile.am‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ EXTRA_DIST = \
1212
c/check-subunit-0.9.3.patch \
1313
c/check-subunit-0.9.5.patch \
1414
c/check-subunit-0.9.6.patch \
15-
python/subunit/tests/__init__.py \
16-
python/subunit/tests/sample-script.py \
17-
python/subunit/tests/sample-two-script.py \
18-
python/subunit/tests/test_chunked.py \
19-
python/subunit/tests/test_details.py \
20-
python/subunit/tests/test_filters.py \
21-
python/subunit/tests/test_filter_to_disk.py \
22-
python/subunit/tests/test_output_filter.py \
23-
python/subunit/tests/test_progress_model.py \
24-
python/subunit/tests/test_run.py \
25-
python/subunit/tests/test_subunit_filter.py \
26-
python/subunit/tests/test_subunit_stats.py \
27-
python/subunit/tests/test_subunit_tags.py \
28-
python/subunit/tests/test_tap2subunit.py \
29-
python/subunit/tests/test_test_protocol.py \
30-
python/subunit/tests/test_test_protocol2.py \
31-
python/subunit/tests/test_test_results.py \
15+
python/tests/__init__.py \
16+
python/tests/sample-script.py \
17+
python/tests/sample-two-script.py \
18+
python/tests/test_chunked.py \
19+
python/tests/test_details.py \
20+
python/tests/test_filters.py \
21+
python/tests/test_filter_to_disk.py \
22+
python/tests/test_output_filter.py \
23+
python/tests/test_progress_model.py \
24+
python/tests/test_run.py \
25+
python/tests/test_subunit_filter.py \
26+
python/tests/test_subunit_stats.py \
27+
python/tests/test_subunit_tags.py \
28+
python/tests/test_tap2subunit.py \
29+
python/tests/test_test_protocol.py \
30+
python/tests/test_test_protocol2.py \
31+
python/tests/test_test_results.py \
3232
python/subunit/filter_scripts/__init__.py \
3333
python/subunit/filter_scripts/subunit_1to2.py \
3434
python/subunit/filter_scripts/subunit2csv.py \

‎NEWS‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
subunit release notes
33
---------------------
44

5+
1.4.6 (UNRELEASED)
6+
---------------------
7+
8+
IMPROVEMENTS
9+
~~~~~~~~~~~~
10+
11+
* Stop installing tests. (Jelmer Vernooij)
12+
513
1.4.5 (2025-11-10)
614
---------------------
715

‎all_tests.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import unittest
1818

1919
import subunit
20+
import tests
2021

2122

2223
class ShellTests(subunit.ExecTestCase):
@@ -29,7 +30,7 @@ def test_functions(self):
2930

3031
def test_suite():
3132
result = unittest.TestSuite()
32-
result.addTest(subunit.test_suite())
33+
result.addTest(tests.test_suite())
3334
result.addTest(ShellTests("test_sourcing"))
3435
result.addTest(ShellTests("test_functions"))
3536
return result

‎pyproject.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ requires = ["iso8601", "setuptools>=61.2", "testtools"]
55
[tool.ruff]
66
line-length = 120
77

8+
[[tool.mypy.overrides]]
9+
module = [
10+
"gi",
11+
"gi.repository",
12+
"junitxml",
13+
"testscenarios",
14+
]
15+
ignore_missing_imports = true
16+
817
[project]
918
authors = [
1019
{ name = "Robert Collins", email = "subunit-dev@lists.launchpad.net" },

‎python/subunit/__init__.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,6 @@ def test_script_two(self):
175175
PROGRESS_POP = 3
176176

177177

178-
def test_suite():
179-
import subunit.tests
180-
181-
return subunit.tests.test_suite()
182-
183-
184178
def join_dir(base_path, path):
185179
"""
186180
Returns an absolute path to C{path}, calculated relative to the parent

‎python/subunit/v2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
EPOCH = datetime.datetime.fromtimestamp(0, tz=iso8601.UTC)
4949
NUL_ELEMENT = b"\0"[0]
5050
# Contains True for types for which 'nul in thing' falsely returns false.
51-
_nul_test_broken = {}
51+
_nul_test_broken: dict[type, bool] = {}
5252

5353

5454
def read_exactly(stream, size):

python/subunit/tests/__init__.py renamed to python/tests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
_remote_exception_str_chunked = "57\r\n" + _remote_exception_str + ": boo qux\n0\r\n"
2727

2828

29-
from subunit.tests import ( # noqa: E402
29+
from . import ( # noqa: E402
3030
test_chunked,
3131
test_details,
3232
test_filter_to_disk,

0 commit comments

Comments
 (0)