diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-14 15:41:23 +0000 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-14 15:41:23 +0000 |
commit | 2731494720ce3cfa4816e9f3c711bbc19316acde (patch) | |
tree | 09e2669920003062416235922fdd9ad79f3c439e /Lib/test/support.py | |
parent | c8ef6436d833b06f2b916127701abebb114ed38c (diff) | |
download | cpython-2731494720ce3cfa4816e9f3c711bbc19316acde.tar.gz cpython-2731494720ce3cfa4816e9f3c711bbc19316acde.zip |
Merged revisions 85482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85482 | antoine.pitrou | 2010-10-14 17:34:31 +0200 (jeu., 14 oct. 2010) | 4 lines
Replace the "compiler" resource with the more generic "cpu", so
as to mark CPU-heavy tests.
........
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r-- | Lib/test/support.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index 34005e857eb..842cda6c349 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -873,7 +873,7 @@ def _id(obj): return obj def requires_resource(resource): - if resource_is_enabled(resource): + if is_resource_enabled(resource): return _id else: return unittest.skip("resource {0!r} is not enabled".format(resource)) |