Author: alexander.belopolsky Date: Tue Nov 30 04:03:30 2010 New Revision: 86875 Log: Issue #10572: Moved json tests to Lib/test/json_tests. Approved by Raymond Hettinger. Added: python/branches/py3k/Lib/test/json_tests/ - copied from r86873, /python/branches/py3k/Lib/json/tests/ Removed: python/branches/py3k/Lib/json/tests/ Modified: python/branches/py3k/Lib/test/json_tests/__init__.py python/branches/py3k/Lib/test/test_json.py python/branches/py3k/Makefile.pre.in Modified: python/branches/py3k/Lib/test/json_tests/__init__.py ============================================================================== --- /python/branches/py3k/Lib/json/tests/__init__.py (original) +++ python/branches/py3k/Lib/test/json_tests/__init__.py Tue Nov 30 04:03:30 2010 @@ -10,7 +10,7 @@ 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)) Modified: python/branches/py3k/Lib/test/test_json.py ============================================================================== --- python/branches/py3k/Lib/test/test_json.py (original) +++ python/branches/py3k/Lib/test/test_json.py Tue Nov 30 04:03:30 2010 @@ -5,12 +5,12 @@ 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__": Modified: python/branches/py3k/Makefile.pre.in ============================================================================== --- python/branches/py3k/Makefile.pre.in (original) +++ python/branches/py3k/Makefile.pre.in Tue Nov 30 04:03:30 2010 @@ -890,7 +890,7 @@ 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 \