From ad05abd2f7fb4e43badc2441ab6d187caa31512d Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 7 May 2021 13:25:57 -0400
Subject: [PATCH] Just run unit tests normally on Python 3.

---
 src/allmydata/test/python3_tests.py | 37 -----------------------------
 src/allmydata/util/_python3.py      | 10 ++------
 tox.ini                             |  3 +--
 3 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 src/allmydata/test/python3_tests.py

diff --git a/src/allmydata/test/python3_tests.py b/src/allmydata/test/python3_tests.py
deleted file mode 100644
index 9326caa51..000000000
--- a/src/allmydata/test/python3_tests.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-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 5f78af626..4a771a4d5 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -1,14 +1,8 @@
 """
 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
+At this point all unit tests have been ported to Python 3, so you can just run
+them normally.
 
 This module has been ported to Python 3.
 """
diff --git a/tox.ini b/tox.ini
index 4b52fd316..84eafd910 100644
--- a/tox.ini
+++ b/tox.ini
@@ -62,8 +62,7 @@ extras = test
 setenv =
        # Define TEST_SUITE in the environment as an aid to constructing the
        # correct test command below.
-       !py36: TEST_SUITE = allmydata
-       py36: TEST_SUITE = allmydata.test.python3_tests
+       TEST_SUITE = allmydata
 
 commands =
          # As an aid to debugging, dump all of the Python packages and their