Move extension module loader tests over to importlib.test.abc.LoaderTests.

diff --git a/Lib/importlib/NOTES b/Lib/importlib/NOTES
index 51a63974360d8a5785f400e84a1a8b01502cdfdb..9d5fd6959de0103ec604188c52b0f91f38a64f70 100644 (file)
--- a/Lib/importlib/NOTES
+++ b/Lib/importlib/NOTES
@@ -4,7 +4,6 @@ to do
 * Use test.abc.LoaderTests
 
     + frozen
-    + extension
     + source
 
 * Reorganize support code.

diff --git a/Lib/importlib/test/extension/test_loader.py b/Lib/importlib/test/extension/test_loader.py
index 4f2a0d87e2c902beb447b021a271849b24aae3bc..51d6161eff0c251431b9fb63af95e1f71bccabe5 100644 (file)
--- a/Lib/importlib/test/extension/test_loader.py
+++ b/Lib/importlib/test/extension/test_loader.py
@@ -1,12 +1,13 @@
 import importlib
 from . import test_path_hook
+from .. import abc
 from .. import support
 
 import sys
 import unittest
 
 
-class LoaderTests(unittest.TestCase):
+class LoaderTests(abc.LoaderTests):
 
     """Test load_module() for extension modules."""
 
@@ -16,7 +17,7 @@ class LoaderTests(unittest.TestCase):
                                                 False)
         return loader.load_module(fullname)
 
-    def test_success(self):
+    def test_module(self):
         with support.uncache(test_path_hook.NAME):
             module = self.load_module(test_path_hook.NAME)
             for attr, value in [('__name__', test_path_hook.NAME),
@@ -24,7 +25,25 @@ class LoaderTests(unittest.TestCase):
                 self.assertEqual(getattr(module, attr), value)
             self.assert_(test_path_hook.NAME in sys.modules)
 
-    def test_failure(self):
+    def test_package(self):
+        # Extensions are not found in packages.
+        pass
+
+    def test_lacking_parent(self):
+        # Extensions are not found in packages.
+        pass
+
+    def test_module_reuse(self):
+        with support.uncache(test_path_hook.NAME):
+            module1 = self.load_module(test_path_hook.NAME)
+            module2 = self.load_module(test_path_hook.NAME)
+            self.assert_(module1 is module2)
+
+    def test_state_after_failure(self):
+        # No easy way to trigger a failure after a successful import.
+        pass
+
+    def test_unloadable(self):
         self.assertRaises(ImportError, self.load_module, 'asdfjkl;')