#18273: merge with 3.3.

Lib/test/test_json.py

-"""Tests for json.
-
-The tests for json are defined in the json.tests package;
-the test_suite() function there returns a test suite that's ready to
-be run.
-"""
-
-from test import json_tests
-import test.support
-
-
-def test_main():
-    test.support.run_unittest(json_tests.test_suite())
-
-
-if __name__ == "__main__":
-    test_main()

Lib/test/json_tests/__init__.py → Lib/test/test_json/__init__.py

@@ -44,12 +44,12 @@ class TestCTest(CTest):
 
 here = os.path.dirname(__file__)
 
-def test_suite():
+def load_tests(*args):
     suite = additional_tests()
     loader = unittest.TestLoader()
     for fn in os.listdir(here):
         if fn.startswith("test") and fn.endswith(".py"):
-            modname = "test.json_tests." + fn[:-3]
+            modname = "test.test_json." + fn[:-3]
             __import__(modname)
             module = sys.modules[modname]
             suite.addTests(loader.loadTestsFromModule(module))
@@ -62,12 +62,3 @@ def additional_tests():
     suite.addTest(TestPyTest('test_pyjson'))
     suite.addTest(TestCTest('test_cjson'))
     return suite
-
-def main():
-    suite = test_suite()
-    runner = unittest.TextTestRunner()
-    runner.run(suite)
-
-if __name__ == '__main__':
-    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
-    main()

Lib/test/test_json/__main__.py

+import unittest
+from test.test_json import load_tests
+
+unittest.main()

Lib/test/json_tests/test_decode.py → Lib/test/test_json/test_decode.py

 import decimal
 from io import StringIO
 from collections import OrderedDict
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class TestDecode:

Lib/test/json_tests/test_default.py → Lib/test/test_json/test_default.py

-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class TestDefault:

Lib/test/json_tests/test_dump.py → Lib/test/test_json/test_dump.py

 from io import StringIO
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 from test.support import bigmemtest, _1G
 

Lib/test/json_tests/test_encode_basestring_ascii.py → Lib/test/test_json/test_encode_basestring_ascii.py

 from collections import OrderedDict
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 CASES = [

Lib/test/json_tests/test_fail.py → Lib/test/test_json/test_fail.py

-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 import re
 
 # 2007-10-05

Lib/test/json_tests/test_float.py → Lib/test/test_json/test_float.py

 import math
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class TestFloat:

Lib/test/json_tests/test_indent.py → Lib/test/test_json/test_indent.py

 import textwrap
 from io import StringIO
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class TestIndent:

Lib/test/json_tests/test_pass1.py → Lib/test/test_json/test_pass1.py

-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 # from http://json.org/JSON_checker/test/pass1.json

Lib/test/json_tests/test_pass2.py → Lib/test/test_json/test_pass2.py

-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 # from http://json.org/JSON_checker/test/pass2.json

Lib/test/json_tests/test_pass3.py → Lib/test/test_json/test_pass3.py

-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 # from http://json.org/JSON_checker/test/pass3.json

Lib/test/json_tests/test_recursion.py → Lib/test/test_json/test_recursion.py

-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class JSONTestObject:

Lib/test/json_tests/test_scanstring.py → Lib/test/test_json/test_scanstring.py

 import sys
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class TestScanstring:

Lib/test/json_tests/test_separators.py → Lib/test/test_json/test_separators.py

 import textwrap
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class TestSeparators:

Lib/test/json_tests/test_speedups.py → Lib/test/test_json/test_speedups.py

-from test.json_tests import CTest
+from test.test_json import CTest
 
 
 class TestSpeedups(CTest):

Lib/test/json_tests/test_unicode.py → Lib/test/test_json/test_unicode.py

 from collections import OrderedDict
-from test.json_tests import PyTest, CTest
+from test.test_json import PyTest, CTest
 
 
 class TestUnicode:

Makefile.pre.in

@@ -1079,7 +1079,7 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
                 test/namespace_pkgs/module_and_namespace_package/a_test \
 		collections concurrent concurrent/futures encodings \
 		email email/mime test/test_email test/test_email/data \
-		html json test/json_tests http dbm xmlrpc \
+		html json test/test_json http dbm xmlrpc \
 		sqlite3 sqlite3/test \
 		logging csv wsgiref urllib \
 		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \

Misc/NEWS

@@ -634,6 +634,9 @@ Library
 Tests
 -----
 
+- Issue #18273: move the tests in Lib/test/json_tests to Lib/test/test_json
+  and make them discoverable by unittest.  Patch by Zachary Ware.
+
 - Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
 
 - Issue #18396: Fix spurious test failure in test_signal on Windows when