mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 21:55:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Change more tests to use import_module for the modules that

Browse source 
should cause tests to be skipped.  Also rename import_function
to the more descriptive get_attribute and add a docstring.
This commit is contained in:
R. David Murray 2009-03-30 23:05:48 +00:00
parent dc340eedaa
commit 3db8a3432b
17 changed files with 53 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/test/test_support.py
View file

@ -12,6 +12,7 @@ import platform
import shutil
import warnings
import unittest
import importlib
__all__ = ["Error", "TestFailed", "ResourceDenied", "import_module",
"verbose", "use_resources", "max_memuse", "record_original_stdout",
@ -25,7 +26,7 @@ __all__ = ["Error", "TestFailed", "ResourceDenied", "import_module",
"run_with_locale", "set_memlimit", "bigmemtest", "bigaddrspacetest",
"BasicTestRunner", "run_unittest", "run_doctest", "threading_setup",
"threading_cleanup", "reap_children", "cpython_only",
"check_impl_detail"]
"check_impl_detail", "get_attribute"]
class Error(Exception):
"""Base class for regression test exceptions."""
@ -49,24 +50,26 @@ def import_module(name, deprecated=False):
warnings.filterwarnings("ignore", ".+ (module|package)",
DeprecationWarning)
try:
module = __import__(name, level=0)
module = importlib.import_module(name)
except ImportError:
raise unittest.SkipTest("No module named " + name)
else:
return module
def import_function(module, name, deprecated=False):
def get_attribute(module, name, deprecated=False):
"""Get an attribute from the module, raising SkipTest if it is
not available."""
with warnings.catch_warnings():
if deprecated:
warnings.filterwarnings("ignore", ".+ (module|package)",
DeprecationWarning)
try:
function = getattr(module, name)
attribute = getattr(module, name)
except AttributeError:
raise unittest.SkipTest("No function named %s in module %s" % (
name, module.__name__))
raise unittest.SkipTest("module %s has no attribute %s" % (
module.__name__, name))
else:
return function
return attribute
verbose = 1 # Flag set to 0 by regrtest.py