From 76e5c40fc6c1851b3931575eaf6ddf566afc0a79 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 14 Aug 2020 11:21:32 -0400
Subject: [PATCH] Add a module to the test suite which contains all of the
 other ported modules

---
 src/allmydata/test/python3_tests.py | 37 +++++++++++++++++++++++++++++
 src/allmydata/util/_python3.py      | 13 ++++++----
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 src/allmydata/test/python3_tests.py

diff --git a/src/allmydata/test/python3_tests.py b/src/allmydata/test/python3_tests.py
new file mode 100644
index 000000000..9326caa51
--- /dev/null
+++ b/src/allmydata/test/python3_tests.py
@@ -0,0 +1,37 @@
+"""
+This module defines the subset of the full test suite which is expected to
+pass on Python 3 in a way which makes that suite discoverable by trial.
+
+This module has been ported to Python 3.
+"""
+
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from future.utils import PY2
+if PY2:
+    from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+
+from twisted.python.reflect import (
+    namedModule,
+)
+from twisted.trial.runner import (
+    TestLoader,
+)
+from twisted.trial.unittest import (
+    TestSuite,
+)
+
+from allmydata.util._python3 import (
+    PORTED_TEST_MODULES,
+)
+
+def testSuite():
+    loader = TestLoader()
+    return TestSuite(list(
+        loader.loadModule(namedModule(module))
+        for module
+        in PORTED_TEST_MODULES
+    ))
diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index a1750ca18..52d7ddd77 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -1,6 +1,15 @@
 """
 Track the port to Python 3.
 
+The two easiest ways to run the part of the test suite which is expected to
+pass on Python 3 are::
+
+    $ tox -e py36
+
+and::
+
+    $ trial allmydata.test.python3_tests
+
 This module has been ported to Python 3.
 """
 
@@ -71,7 +80,3 @@ PORTED_TEST_MODULES = [
     "allmydata.test.test_util",
     "allmydata.test.test_version",
 ]
-
-if __name__ == '__main__':
-    from subprocess import check_call
-    check_call(["trial"] + PORTED_TEST_MODULES)