Issue #10572: Moved json tests to Lib/test/json_tests.

Approved by Raymond Hettinger.

17 files changed, 3 insertions, 3 deletions

diff --git a/Lib/json/tests/__init__.py b/Lib/test/json_tests/__init__.py
index 1a1e3e6..4977468 100644
--- a/Lib/json/tests/__init__.py
+++ b/Lib/test/json_tests/__init__.py
@@ -10,7 +10,7 @@ def test_suite():
     loader = unittest.TestLoader()
     for fn in os.listdir(here):
         if fn.startswith("test") and fn.endswith(".py"):
-            modname = "json.tests." + fn[:-3]
+            modname = "test.json_tests." + fn[:-3]
             __import__(modname)
             module = sys.modules[modname]
             suite.addTests(loader.loadTestsFromModule(module))
diff --git a/Lib/json/tests/test_decode.py b/Lib/test/json_tests/test_decode.py
index f41e5b7..f41e5b7 100644
--- a/Lib/json/tests/test_decode.py
+++ b/Lib/test/json_tests/test_decode.py
diff --git a/Lib/json/tests/test_default.py b/Lib/test/json_tests/test_default.py
index 6a03eeb..6a03eeb 100644
--- a/Lib/json/tests/test_default.py
+++ b/Lib/test/json_tests/test_default.py
diff --git a/Lib/json/tests/test_dump.py b/Lib/test/json_tests/test_dump.py
index 8df234b..8df234b 100644
--- a/Lib/json/tests/test_dump.py
+++ b/Lib/test/json_tests/test_dump.py
diff --git a/Lib/json/tests/test_encode_basestring_ascii.py b/Lib/test/json_tests/test_encode_basestring_ascii.py
index 4fddd12..4fddd12 100644
--- a/Lib/json/tests/test_encode_basestring_ascii.py
+++ b/Lib/test/json_tests/test_encode_basestring_ascii.py
diff --git a/Lib/json/tests/test_fail.py b/Lib/test/json_tests/test_fail.py
index 9768edf..9768edf 100644
--- a/Lib/json/tests/test_fail.py
+++ b/Lib/test/json_tests/test_fail.py
diff --git a/Lib/json/tests/test_float.py b/Lib/test/json_tests/test_float.py
index ca4a506..ca4a506 100644
--- a/Lib/json/tests/test_float.py
+++ b/Lib/test/json_tests/test_float.py
diff --git a/Lib/json/tests/test_indent.py b/Lib/test/json_tests/test_indent.py
index d8030aa..d8030aa 100644
--- a/Lib/json/tests/test_indent.py
+++ b/Lib/test/json_tests/test_indent.py
diff --git a/Lib/json/tests/test_pass1.py b/Lib/test/json_tests/test_pass1.py
index 719c113..719c113 100644
--- a/Lib/json/tests/test_pass1.py
+++ b/Lib/test/json_tests/test_pass1.py
diff --git a/Lib/json/tests/test_pass2.py b/Lib/test/json_tests/test_pass2.py
index 379117e..379117e 100644
--- a/Lib/json/tests/test_pass2.py
+++ b/Lib/test/json_tests/test_pass2.py
diff --git a/Lib/json/tests/test_pass3.py b/Lib/test/json_tests/test_pass3.py
index 9151c43..9151c43 100644
--- a/Lib/json/tests/test_pass3.py
+++ b/Lib/test/json_tests/test_pass3.py
diff --git a/Lib/json/tests/test_recursion.py b/Lib/test/json_tests/test_recursion.py
index 1e9b8ab..1e9b8ab 100644
--- a/Lib/json/tests/test_recursion.py
+++ b/Lib/test/json_tests/test_recursion.py
diff --git a/Lib/json/tests/test_scanstring.py b/Lib/test/json_tests/test_scanstring.py
index d503851..d503851 100644
--- a/Lib/json/tests/test_scanstring.py
+++ b/Lib/test/json_tests/test_scanstring.py
diff --git a/Lib/json/tests/test_separators.py b/Lib/test/json_tests/test_separators.py
index d5b92bd..d5b92bd 100644
--- a/Lib/json/tests/test_separators.py
+++ b/Lib/test/json_tests/test_separators.py
diff --git a/Lib/json/tests/test_speedups.py b/Lib/test/json_tests/test_speedups.py
index 2718409..2718409 100644
--- a/Lib/json/tests/test_speedups.py
+++ b/Lib/test/json_tests/test_speedups.py
diff --git a/Lib/json/tests/test_unicode.py b/Lib/test/json_tests/test_unicode.py
index e336c91..e336c91 100644
--- a/Lib/json/tests/test_unicode.py
+++ b/Lib/test/json_tests/test_unicode.py
diff --git a/Lib/test/test_json.py b/Lib/test/test_json.py
index a4b6e7a..41ff897 100644
--- a/Lib/test/test_json.py
+++ b/Lib/test/test_json.py
@@ -5,12 +5,12 @@ the test_suite() function there returns a test suite that's ready to
 be run.
 """
 
-import json.tests
+from test import json_tests
 import test.support
 
 
 def test_main():
-    test.support.run_unittest(json.tests.test_suite())
+    test.support.run_unittest(json_tests.test_suite())
 
 
 if __name__ == "__main__":