43 files changed, 33 insertions, 38 deletions
diff --git a/Lib/test/test_importlib.py b/Lib/test/test_importlib.py
deleted file mode 100644
index 6ed0585..0000000
--- a/Lib/test/test_importlib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from importlib.test.__main__ import test_main
-
-
-if __name__ == '__main__':
-    test_main()
diff --git a/Lib/importlib/test/__init__.py b/Lib/test/test_importlib/__init__.py
index 815a706..502eb7d 100644
--- a/Lib/importlib/test/__init__.py
+++ b/Lib/test/test_importlib/__init__.py
@@ -1,5 +1,6 @@
 import os
 import sys
+from .. import support
 import unittest
 
 def test_suite(package=__package__, directory=os.path.dirname(__file__)):
@@ -23,3 +24,10 @@ def test_suite(package=__package__, directory=os.path.dirname(__file__)):
         else:
             continue
     return suite
+
+
+def test_main():
+    start_dir = os.path.dirname(__file__)
+    top_dir = os.path.dirname(os.path.dirname(start_dir))
+    test_loader = unittest.TestLoader()
+    support.run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
diff --git a/Lib/importlib/test/__main__.py b/Lib/test/test_importlib/__main__.py
index 92171b2..c397128 100644
--- a/Lib/importlib/test/__main__.py
+++ b/Lib/test/test_importlib/__main__.py
@@ -4,17 +4,7 @@ Specifying the ``--builtin`` flag will run tests, where applicable, with
 builtins.__import__ instead of importlib.__import__.
 
 """
-from importlib.test.import_ import util
-import os.path
-from test.support import run_unittest
-import unittest
-
-
-def test_main():
-    start_dir = os.path.dirname(__file__)
-    top_dir = os.path.dirname(os.path.dirname(start_dir))
-    test_loader = unittest.TestLoader()
-    run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
+from . import test_main
 
 
 if __name__ == '__main__':
diff --git a/Lib/importlib/test/abc.py b/Lib/test/test_importlib/abc.py
index 2c17ac3..2c17ac3 100644
--- a/Lib/importlib/test/abc.py
+++ b/Lib/test/test_importlib/abc.py
diff --git a/Lib/importlib/test/benchmark.py b/Lib/test/test_importlib/benchmark.py
index 183e818..183e818 100644
--- a/Lib/importlib/test/benchmark.py
+++ b/Lib/test/test_importlib/benchmark.py
diff --git a/Lib/importlib/test/builtin/__init__.py b/Lib/test/test_importlib/builtin/__init__.py
index 31a3b5f..15c0ade 100644
--- a/Lib/importlib/test/builtin/__init__.py
+++ b/Lib/test/test_importlib/builtin/__init__.py
@@ -1,10 +1,10 @@
-import importlib.test
+from .. import test_suite
 import os
 
 
 def test_suite():
     directory = os.path.dirname(__file__)
-    return importlib.test.test_suite('importlib.test.builtin', directory)
+    return test_suite('importlib.test.builtin', directory)
 
 
 if __name__ == '__main__':
diff --git a/Lib/importlib/test/builtin/test_finder.py b/Lib/test/test_importlib/builtin/test_finder.py
index 146538d..146538d 100644
--- a/Lib/importlib/test/builtin/test_finder.py
+++ b/Lib/test/test_importlib/builtin/test_finder.py
diff --git a/Lib/importlib/test/builtin/test_loader.py b/Lib/test/test_importlib/builtin/test_loader.py
index 8e186e7..8e186e7 100644
--- a/Lib/importlib/test/builtin/test_loader.py
+++ b/Lib/test/test_importlib/builtin/test_loader.py
diff --git a/Lib/importlib/test/builtin/util.py b/Lib/test/test_importlib/builtin/util.py
index 5704699..5704699 100644
--- a/Lib/importlib/test/builtin/util.py
+++ b/Lib/test/test_importlib/builtin/util.py
diff --git a/Lib/importlib/test/frozen/__init__.py b/Lib/test/test_importlib/extension/__init__.py
index 2945eeb..c033923 100644
--- a/Lib/importlib/test/frozen/__init__.py
+++ b/Lib/test/test_importlib/extension/__init__.py
@@ -1,11 +1,11 @@
-import importlib.test
+from .. import test_suite
 import os.path
 import unittest
 
 
 def test_suite():
     directory = os.path.dirname(__file__)
-    return importlib.test.test_suite('importlib.test.frozen', directory)
+    return test_suite('importlib.test.extension', directory)
 
 
 if __name__ == '__main__':
diff --git a/Lib/importlib/test/extension/test_case_sensitivity.py b/Lib/test/test_importlib/extension/test_case_sensitivity.py
index bdc21e7..bdc21e7 100644
--- a/Lib/importlib/test/extension/test_case_sensitivity.py
+++ b/Lib/test/test_importlib/extension/test_case_sensitivity.py
diff --git a/Lib/importlib/test/extension/test_finder.py b/Lib/test/test_importlib/extension/test_finder.py
index 1c60292..1c60292 100644
--- a/Lib/importlib/test/extension/test_finder.py
+++ b/Lib/test/test_importlib/extension/test_finder.py
diff --git a/Lib/importlib/test/extension/test_loader.py b/Lib/test/test_importlib/extension/test_loader.py
index 917843f..917843f 100644
--- a/Lib/importlib/test/extension/test_loader.py
+++ b/Lib/test/test_importlib/extension/test_loader.py
diff --git a/Lib/importlib/test/extension/test_path_hook.py b/Lib/test/test_importlib/extension/test_path_hook.py
index 129e6e2..129e6e2 100644
--- a/Lib/importlib/test/extension/test_path_hook.py
+++ b/Lib/test/test_importlib/extension/test_path_hook.py
diff --git a/Lib/importlib/test/extension/util.py b/Lib/test/test_importlib/extension/util.py
index a266dd9..a266dd9 100644
--- a/Lib/importlib/test/extension/util.py
+++ b/Lib/test/test_importlib/extension/util.py
diff --git a/Lib/importlib/test/source/__init__.py b/Lib/test/test_importlib/frozen/__init__.py
index 8d7c49d..9ef103b 100644
--- a/Lib/importlib/test/source/__init__.py
+++ b/Lib/test/test_importlib/frozen/__init__.py
@@ -1,11 +1,11 @@
-import importlib.test
+from .. import test_suite
 import os.path
 import unittest
 
 
 def test_suite():
     directory = os.path.dirname(__file__)
-    return importlib.test.test_suite('importlib.test.source', directory)
+    return test_suite('importlib.test.frozen', directory)
 
 
 if __name__ == '__main__':
diff --git a/Lib/importlib/test/frozen/test_finder.py b/Lib/test/test_importlib/frozen/test_finder.py
index 54c0c90..fa0c2a0 100644
--- a/Lib/importlib/test/frozen/test_finder.py
+++ b/Lib/test/test_importlib/frozen/test_finder.py
@@ -1,4 +1,4 @@
-from ... import machinery
+from importlib import machinery
 from .. import abc
 
 import unittest
diff --git a/Lib/importlib/test/frozen/test_loader.py b/Lib/test/test_importlib/frozen/test_loader.py
index 4b8ec15..4b8ec15 100644
--- a/Lib/importlib/test/frozen/test_loader.py
+++ b/Lib/test/test_importlib/frozen/test_loader.py
diff --git a/Lib/importlib/test/import_/__init__.py b/Lib/test/test_importlib/import_/__init__.py
index fdf7661..366e531 100644
--- a/Lib/importlib/test/import_/__init__.py
+++ b/Lib/test/test_importlib/import_/__init__.py
@@ -1,11 +1,11 @@
-import importlib.test
+from .. import test_suite
 import os.path
 import unittest
 
 
 def test_suite():
     directory = os.path.dirname(__file__)
-    return importlib.test.test_suite('importlib.test.import_', directory)
+    return test_suite('importlib.test.import_', directory)
 
 
 if __name__ == '__main__':
diff --git a/Lib/importlib/test/import_/test___package__.py b/Lib/test/test_importlib/import_/test___package__.py
index 783cde1..783cde1 100644
--- a/Lib/importlib/test/import_/test___package__.py
+++ b/Lib/test/test_importlib/import_/test___package__.py
diff --git a/Lib/importlib/test/import_/test_api.py b/Lib/test/test_importlib/import_/test_api.py
index 2fa1f90..2fa1f90 100644
--- a/Lib/importlib/test/import_/test_api.py
+++ b/Lib/test/test_importlib/import_/test_api.py
diff --git a/Lib/importlib/test/import_/test_caching.py b/Lib/test/test_importlib/import_/test_caching.py
index bf68027..bf68027 100644
--- a/Lib/importlib/test/import_/test_caching.py
+++ b/Lib/test/test_importlib/import_/test_caching.py
diff --git a/Lib/importlib/test/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py
index 281961d..281961d 100644
--- a/Lib/importlib/test/import_/test_fromlist.py
+++ b/Lib/test/test_importlib/import_/test_fromlist.py
diff --git a/Lib/importlib/test/import_/test_meta_path.py b/Lib/test/test_importlib/import_/test_meta_path.py
index 4d85f80..4d85f80 100644
--- a/Lib/importlib/test/import_/test_meta_path.py
+++ b/Lib/test/test_importlib/import_/test_meta_path.py
diff --git a/Lib/importlib/test/import_/test_packages.py b/Lib/test/test_importlib/import_/test_packages.py
index bfa18dc..bfa18dc 100644
--- a/Lib/importlib/test/import_/test_packages.py
+++ b/Lib/test/test_importlib/import_/test_packages.py
diff --git a/Lib/importlib/test/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
index 0c086ce..0c086ce 100644
--- a/Lib/importlib/test/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
diff --git a/Lib/importlib/test/import_/test_relative_imports.py b/Lib/test/test_importlib/import_/test_relative_imports.py
index 4569c26..4569c26 100644
--- a/Lib/importlib/test/import_/test_relative_imports.py
+++ b/Lib/test/test_importlib/import_/test_relative_imports.py
diff --git a/Lib/importlib/test/import_/util.py b/Lib/test/test_importlib/import_/util.py
index 86ac065..86ac065 100644
--- a/Lib/importlib/test/import_/util.py
+++ b/Lib/test/test_importlib/import_/util.py
diff --git a/Lib/importlib/test/regrtest.py b/Lib/test/test_importlib/regrtest.py
index a5be11f..a5be11f 100644
--- a/Lib/importlib/test/regrtest.py
+++ b/Lib/test/test_importlib/regrtest.py
diff --git a/Lib/importlib/test/extension/__init__.py b/Lib/test/test_importlib/source/__init__.py
index 2ec5840..3ef97f3 100644
--- a/Lib/importlib/test/extension/__init__.py
+++ b/Lib/test/test_importlib/source/__init__.py
@@ -1,11 +1,11 @@
-import importlib.test
+from .. import test_suite
 import os.path
 import unittest
 
 
 def test_suite():
     directory = os.path.dirname(__file__)
-    return importlib.test.test_suite('importlib.test.extension', directory)
+    return test.test_suite('importlib.test.source', directory)
 
 
 if __name__ == '__main__':
diff --git a/Lib/importlib/test/source/test_abc_loader.py b/Lib/test/test_importlib/source/test_abc_loader.py
index afcaad0..afcaad0 100644
--- a/Lib/importlib/test/source/test_abc_loader.py
+++ b/Lib/test/test_importlib/source/test_abc_loader.py
diff --git a/Lib/importlib/test/source/test_case_sensitivity.py b/Lib/test/test_importlib/source/test_case_sensitivity.py
index 21a4378..21a4378 100644
--- a/Lib/importlib/test/source/test_case_sensitivity.py
+++ b/Lib/test/test_importlib/source/test_case_sensitivity.py
diff --git a/Lib/importlib/test/source/test_file_loader.py b/Lib/test/test_importlib/source/test_file_loader.py
index 236abfb..c401cf7 100644
--- a/Lib/importlib/test/source/test_file_loader.py
+++ b/Lib/test/test_importlib/source/test_file_loader.py
@@ -1,4 +1,4 @@
-from ... import _bootstrap
+from importlib import machinery
 import importlib
 import importlib.abc
 from .. import abc
@@ -62,7 +62,7 @@ class SimpleTest(unittest.TestCase):
     # [basic]
     def test_module(self):
         with source_util.create_modules('_temp') as mapping:
-            loader = _bootstrap.SourceFileLoader('_temp', mapping['_temp'])
+            loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
             module = loader.load_module('_temp')
             self.assertIn('_temp', sys.modules)
             check = {'__name__': '_temp', '__file__': mapping['_temp'],
@@ -72,7 +72,7 @@ class SimpleTest(unittest.TestCase):
 
     def test_package(self):
         with source_util.create_modules('_pkg.__init__') as mapping:
-            loader = _bootstrap.SourceFileLoader('_pkg',
+            loader = machinery.SourceFileLoader('_pkg',
                                                  mapping['_pkg.__init__'])
             module = loader.load_module('_pkg')
             self.assertIn('_pkg', sys.modules)
@@ -85,7 +85,7 @@ class SimpleTest(unittest.TestCase):
 
     def test_lacking_parent(self):
         with source_util.create_modules('_pkg.__init__', '_pkg.mod')as mapping:
-            loader = _bootstrap.SourceFileLoader('_pkg.mod',
+            loader = machinery.SourceFileLoader('_pkg.mod',
                                                     mapping['_pkg.mod'])
             module = loader.load_module('_pkg.mod')
             self.assertIn('_pkg.mod', sys.modules)
@@ -100,7 +100,7 @@ class SimpleTest(unittest.TestCase):
 
     def test_module_reuse(self):
         with source_util.create_modules('_temp') as mapping:
-            loader = _bootstrap.SourceFileLoader('_temp', mapping['_temp'])
+            loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
             module = loader.load_module('_temp')
             module_id = id(module)
             module_dict_id = id(module.__dict__)
@@ -125,7 +125,7 @@ class SimpleTest(unittest.TestCase):
                 setattr(orig_module, attr, value)
             with open(mapping[name], 'w') as file:
                 file.write('+++ bad syntax +++')
-            loader = _bootstrap.SourceFileLoader('_temp', mapping['_temp'])
+            loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
             with self.assertRaises(SyntaxError):
                 loader.load_module(name)
             for attr in attributes:
@@ -136,7 +136,7 @@ class SimpleTest(unittest.TestCase):
         with source_util.create_modules('_temp') as mapping:
             with open(mapping['_temp'], 'w') as file:
                 file.write('=')
-            loader = _bootstrap.SourceFileLoader('_temp', mapping['_temp'])
+            loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
             with self.assertRaises(SyntaxError):
                 loader.load_module('_temp')
             self.assertNotIn('_temp', sys.modules)
@@ -149,7 +149,7 @@ class SimpleTest(unittest.TestCase):
             file.write("# test file for importlib")
         try:
             with util.uncache('_temp'):
-                loader = _bootstrap.SourceFileLoader('_temp', file_path)
+                loader = machinery.SourceFileLoader('_temp', file_path)
                 mod = loader.load_module('_temp')
                 self.assertEqual(file_path, mod.__file__)
                 self.assertEqual(imp.cache_from_source(file_path),
@@ -175,7 +175,7 @@ class SimpleTest(unittest.TestCase):
                 if e.errno != getattr(errno, 'EOVERFLOW', None):
                     raise
                 self.skipTest("cannot set modification time to large integer ({})".format(e))
-            loader = _bootstrap.SourceFileLoader('_temp', mapping['_temp'])
+            loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
             mod = loader.load_module('_temp')
             # Sanity checks.
             self.assertEqual(mod.__cached__, compiled)
@@ -290,7 +290,7 @@ class BadBytecodeTest(unittest.TestCase):
 
 class SourceLoaderBadBytecodeTest(BadBytecodeTest):
 
-    loader = _bootstrap.SourceFileLoader
+    loader = machinery.SourceFileLoader
 
     @source_util.writes_bytecode_files
     def test_empty_file(self):
@@ -414,7 +414,7 @@ class SourceLoaderBadBytecodeTest(BadBytecodeTest):
 
 class SourcelessLoaderBadBytecodeTest(BadBytecodeTest):
 
-    loader = _bootstrap.SourcelessFileLoader
+    loader = machinery.SourcelessFileLoader
 
     def test_empty_file(self):
         def test(name, mapping, bytecode_path):
diff --git a/Lib/importlib/test/source/test_finder.py b/Lib/test/test_importlib/source/test_finder.py
index fa5d356..fa5d356 100644
--- a/Lib/importlib/test/source/test_finder.py
+++ b/Lib/test/test_importlib/source/test_finder.py
diff --git a/Lib/importlib/test/source/test_path_hook.py b/Lib/test/test_importlib/source/test_path_hook.py
index 54c0699..54c0699 100644
--- a/Lib/importlib/test/source/test_path_hook.py
+++ b/Lib/test/test_importlib/source/test_path_hook.py
diff --git a/Lib/importlib/test/source/test_source_encoding.py b/Lib/test/test_importlib/source/test_source_encoding.py
index 0ca5195..0ca5195 100644
--- a/Lib/importlib/test/source/test_source_encoding.py
+++ b/Lib/test/test_importlib/source/test_source_encoding.py
diff --git a/Lib/importlib/test/source/util.py b/Lib/test/test_importlib/source/util.py
index ae65663..ae65663 100644
--- a/Lib/importlib/test/source/util.py
+++ b/Lib/test/test_importlib/source/util.py
diff --git a/Lib/importlib/test/test_abc.py b/Lib/test/test_importlib/test_abc.py
index 008bd21..008bd21 100644
--- a/Lib/importlib/test/test_abc.py
+++ b/Lib/test/test_importlib/test_abc.py
diff --git a/Lib/importlib/test/test_api.py b/Lib/test/test_importlib/test_api.py
index ba2a721..ba2a721 100644
--- a/Lib/importlib/test/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
diff --git a/Lib/importlib/test/test_locks.py b/Lib/test/test_importlib/test_locks.py
index d36b71e..d36b71e 100644
--- a/Lib/importlib/test/test_locks.py
+++ b/Lib/test/test_importlib/test_locks.py
diff --git a/Lib/importlib/test/test_util.py b/Lib/test/test_importlib/test_util.py
index efc8977..efc8977 100644
--- a/Lib/importlib/test/test_util.py
+++ b/Lib/test/test_importlib/test_util.py
diff --git a/Lib/importlib/test/util.py b/Lib/test/test_importlib/util.py
index ef32f7d..ef32f7d 100644
--- a/Lib/importlib/test/util.py
+++ b/Lib/test/test_importlib/util.py
diff --git a/Misc/NEWS b/Misc/NEWS
index a09136d..48877fe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -181,6 +181,8 @@ Documentation
 Tests
 -----
 
+- Issue #15168: Move importlib.test to test.test_importlib.
+
 - Issue #15091: Reactivate a test on UNIX which was failing thanks to a
   forgotten importlib.invalidate_caches() call.