summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2013-11-19 03:44:38 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2013-11-19 03:44:38 (GMT)
commit4accf45f0e231987a47e1dc2bee0fef5e1b03962 (patch)
tree42136986997379dc30763f6a99615b4868c18bc6
parent30d8e167ff37f25f63cced74cac970ca409cbd99 (diff)
downloadcpython-4accf45f0e231987a47e1dc2bee0fef5e1b03962.zip
cpython-4accf45f0e231987a47e1dc2bee0fef5e1b03962.tar.gz
cpython-4accf45f0e231987a47e1dc2bee0fef5e1b03962.tar.bz2
Issue #19596: Set untestable tests in test_importlib to None
to avoid reporting success on empty tests.
-rw-r--r--Lib/test/test_importlib/builtin/test_finder.py18
-rw-r--r--Lib/test/test_importlib/builtin/test_loader.py14
-rw-r--r--Lib/test/test_importlib/extension/test_finder.py19
-rw-r--r--Lib/test/test_importlib/extension/test_loader.py15
-rw-r--r--Lib/test/test_importlib/frozen/test_finder.py10
-rw-r--r--Lib/test/test_importlib/frozen/test_loader.py5
-rw-r--r--Misc/NEWS3
7 files changed, 29 insertions, 55 deletions
diff --git a/Lib/test/test_importlib/builtin/test_finder.py b/Lib/test/test_importlib/builtin/test_finder.py
index 146538d..da0ef28 100644
--- a/Lib/test/test_importlib/builtin/test_finder.py
+++ b/Lib/test/test_importlib/builtin/test_finder.py
@@ -16,21 +16,11 @@ class FinderTests(abc.FinderTests):
found = machinery.BuiltinImporter.find_module(builtin_util.NAME)
self.assertTrue(found)
- def test_package(self):
- # Built-in modules cannot be a package.
- pass
+ # Built-in modules cannot be a package.
+ test_package = test_package_in_package = test_package_over_module = None
- def test_module_in_package(self):
- # Built-in modules cannobt be in a package.
- pass
-
- def test_package_in_package(self):
- # Built-in modules cannot be a package.
- pass
-
- def test_package_over_module(self):
- # Built-in modules cannot be a package.
- pass
+ # Built-in modules cannot be in a package.
+ test_module_in_package = None
def test_failure(self):
assert 'importlib' not in sys.builtin_module_names
diff --git a/Lib/test/test_importlib/builtin/test_loader.py b/Lib/test/test_importlib/builtin/test_loader.py
index 8e186e7..12a79c6 100644
--- a/Lib/test/test_importlib/builtin/test_loader.py
+++ b/Lib/test/test_importlib/builtin/test_loader.py
@@ -32,17 +32,11 @@ class LoaderTests(abc.LoaderTests):
module = self.load_module(builtin_util.NAME)
self.verify(module)
- def test_package(self):
- # Built-in modules cannot be a package.
- pass
+ # Built-in modules cannot be a package.
+ test_package = test_lacking_parent = None
- def test_lacking_parent(self):
- # Built-in modules cannot be a package.
- pass
-
- def test_state_after_failure(self):
- # Not way to force an imoprt failure.
- pass
+ # No way to force an import failure.
+ test_state_after_failure = None
def test_module_reuse(self):
# Test that the same module is used in a reload.
diff --git a/Lib/test/test_importlib/extension/test_finder.py b/Lib/test/test_importlib/extension/test_finder.py
index a63cfdb..37f6772 100644
--- a/Lib/test/test_importlib/extension/test_finder.py
+++ b/Lib/test/test_importlib/extension/test_finder.py
@@ -17,21 +17,14 @@ class FinderTests(abc.FinderTests):
def test_module(self):
self.assertTrue(self.find_module(util.NAME))
- def test_package(self):
- # No extension module as an __init__ available for testing.
- pass
+ # No extension module as an __init__ available for testing.
+ test_package = test_package_in_package = None
- def test_module_in_package(self):
- # No extension module in a package available for testing.
- pass
+ # No extension module in a package available for testing.
+ test_module_in_package = None
- def test_package_in_package(self):
- # No extension module as an __init__ available for testing.
- pass
-
- def test_package_over_module(self):
- # Extension modules cannot be an __init__ for a package.
- pass
+ # Extension modules cannot be an __init__ for a package.
+ test_package_over_module = None
def test_failure(self):
self.assertIsNone(self.find_module('asdfjkl;'))
diff --git a/Lib/test/test_importlib/extension/test_loader.py b/Lib/test/test_importlib/extension/test_loader.py
index ca5af20..e790675 100644
--- a/Lib/test/test_importlib/extension/test_loader.py
+++ b/Lib/test/test_importlib/extension/test_loader.py
@@ -38,13 +38,11 @@ class LoaderTests(abc.LoaderTests):
self.assertIsInstance(module.__loader__,
machinery.ExtensionFileLoader)
- def test_package(self):
- # No extension module as __init__ available for testing.
- pass
+ # No extension module as __init__ available for testing.
+ test_package = None
- def test_lacking_parent(self):
- # No extension module in a package available for testing.
- pass
+ # No extension module in a package available for testing.
+ test_lacking_parent = None
def test_module_reuse(self):
with util.uncache(ext_util.NAME):
@@ -52,9 +50,8 @@ class LoaderTests(abc.LoaderTests):
module2 = self.load_module(ext_util.NAME)
self.assertIs(module1, module2)
- def test_state_after_failure(self):
- # No easy way to trigger a failure after a successful import.
- pass
+ # No easy way to trigger a failure after a successful import.
+ test_state_after_failure = None
def test_unloadable(self):
name = 'asdfjkl;'
diff --git a/Lib/test/test_importlib/frozen/test_finder.py b/Lib/test/test_importlib/frozen/test_finder.py
index fa0c2a0..f0abe0e 100644
--- a/Lib/test/test_importlib/frozen/test_finder.py
+++ b/Lib/test/test_importlib/frozen/test_finder.py
@@ -25,13 +25,11 @@ class FinderTests(abc.FinderTests):
loader = self.find('__phello__.spam', ['__phello__'])
self.assertTrue(hasattr(loader, 'load_module'))
- def test_package_in_package(self):
- # No frozen package within another package to test with.
- pass
+ # No frozen package within another package to test with.
+ test_package_in_package = None
- def test_package_over_module(self):
- # No easy way to test.
- pass
+ # No easy way to test.
+ test_package_over_module = None
def test_failure(self):
loader = self.find('<not real>')
diff --git a/Lib/test/test_importlib/frozen/test_loader.py b/Lib/test/test_importlib/frozen/test_loader.py
index 4b8ec15..f3a8bf6 100644
--- a/Lib/test/test_importlib/frozen/test_loader.py
+++ b/Lib/test/test_importlib/frozen/test_loader.py
@@ -65,9 +65,8 @@ class LoaderTests(abc.LoaderTests):
self.assertEqual(repr(module),
"<module '__hello__' (frozen)>")
- def test_state_after_failure(self):
- # No way to trigger an error in a frozen module.
- pass
+ # No way to trigger an error in a frozen module.
+ test_state_after_failure = None
def test_unloadable(self):
assert machinery.FrozenImporter.find_module('_not_real') is None
diff --git a/Misc/NEWS b/Misc/NEWS
index 1ea0e47..897bbc2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,6 +51,9 @@ Library
Tests
-----
+- Issue #19596: Set untestable tests in test_importlib to None to avoid
+ reporting success on empty tests.
+
- Issue #19440: Clean up test_capi by removing an unnecessary __future__
import, converting from test_main to unittest.main, and running the
_testcapi module tests within a unittest TestCase.