mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Issue #18492: Allow all resources when tests are not run by regrtest.py.
This changeset also includes cleanup allowed by this behavior change.
This commit is contained in:
parent
8dd49fe09f
commit
66f2928479
14 changed files with 37 additions and 59 deletions
|
@ -454,23 +454,17 @@ def _is_gui_available():
|
|||
return _is_gui_available.result
|
||||
|
||||
def is_resource_enabled(resource):
|
||||
"""Test whether a resource is enabled. Known resources are set by
|
||||
regrtest.py."""
|
||||
return use_resources is not None and resource in use_resources
|
||||
"""Test whether a resource is enabled.
|
||||
|
||||
Known resources are set by regrtest.py. If not running under regrtest.py,
|
||||
all resources are assumed enabled unless use_resources has been set.
|
||||
"""
|
||||
return use_resources is None or resource in use_resources
|
||||
|
||||
def requires(resource, msg=None):
|
||||
"""Raise ResourceDenied if the specified resource is not available.
|
||||
|
||||
If the caller's module is __main__ then automatically return True. The
|
||||
possibility of False being returned occurs when regrtest.py is
|
||||
executing.
|
||||
"""
|
||||
"""Raise ResourceDenied if the specified resource is not available."""
|
||||
if resource == 'gui' and not _is_gui_available():
|
||||
raise ResourceDenied(_is_gui_available.reason)
|
||||
# see if the caller's module is __main__ - if so, treat as if
|
||||
# the resource was set
|
||||
if sys._getframe(1).f_globals.get("__name__") == "__main__":
|
||||
return
|
||||
if not is_resource_enabled(resource):
|
||||
if msg is None:
|
||||
msg = "Use of the %r resource not enabled" % resource
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue