Issue #10572: Moved json tests to Lib/test/json_tests.
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Tue, 30 Nov 2010 03:03:30 +0000 (03:03 +0000)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Tue, 30 Nov 2010 03:03:30 +0000 (03:03 +0000)
Approved by Raymond Hettinger.

18 files changed:
Lib/test/json_tests/__init__.py [moved from Lib/json/tests/__init__.py with 94% similarity]
Lib/test/json_tests/test_decode.py [moved from Lib/json/tests/test_decode.py with 100% similarity]
Lib/test/json_tests/test_default.py [moved from Lib/json/tests/test_default.py with 100% similarity]
Lib/test/json_tests/test_dump.py [moved from Lib/json/tests/test_dump.py with 100% similarity]
Lib/test/json_tests/test_encode_basestring_ascii.py [moved from Lib/json/tests/test_encode_basestring_ascii.py with 100% similarity]
Lib/test/json_tests/test_fail.py [moved from Lib/json/tests/test_fail.py with 100% similarity]
Lib/test/json_tests/test_float.py [moved from Lib/json/tests/test_float.py with 100% similarity]
Lib/test/json_tests/test_indent.py [moved from Lib/json/tests/test_indent.py with 100% similarity]
Lib/test/json_tests/test_pass1.py [moved from Lib/json/tests/test_pass1.py with 100% similarity]
Lib/test/json_tests/test_pass2.py [moved from Lib/json/tests/test_pass2.py with 100% similarity]
Lib/test/json_tests/test_pass3.py [moved from Lib/json/tests/test_pass3.py with 100% similarity]
Lib/test/json_tests/test_recursion.py [moved from Lib/json/tests/test_recursion.py with 100% similarity]
Lib/test/json_tests/test_scanstring.py [moved from Lib/json/tests/test_scanstring.py with 100% similarity]
Lib/test/json_tests/test_separators.py [moved from Lib/json/tests/test_separators.py with 100% similarity]
Lib/test/json_tests/test_speedups.py [moved from Lib/json/tests/test_speedups.py with 100% similarity]
Lib/test/json_tests/test_unicode.py [moved from Lib/json/tests/test_unicode.py with 100% similarity]
Lib/test/test_json.py
Makefile.pre.in

similarity index 94%
rename from Lib/json/tests/__init__.py
rename to Lib/test/json_tests/__init__.py
index 1a1e3e6d5a7db84f0ecfd2c7be70ec331d372284..4977468e47aa9d7c04babda2f9a1c2a219926b5a 100644 (file)
@@ -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))
index a4b6e7a8294c923eba52629e0e219d5b59fee4eb..41ff8974fc790950e33babe78a037cee4762b1b4 100644 (file)
@@ -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__":
index c605b21409450cbb860d21c7ce80fbe3d572b692..28b3001ee81209f6bc0c8eb22f1812b3e575f9d4 100644 (file)
@@ -890,7 +890,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
                test/tracedmodules test/encoded_modules \
                concurrent concurrent/futures encodings \
                email email/mime email/test email/test/data \
-               html json json/tests http dbm xmlrpc \
+               html json test/json_tests http dbm xmlrpc \
                sqlite3 sqlite3/test \
                logging csv wsgiref urllib \
                lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \