summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_support.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-14 15:43:25 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-14 15:43:25 (GMT)
commitd989f820c880e7dff16293f6d2861330b5019130 (patch)
tree7f87e5e2c2ba73991c20ae7f4fd7e72384c318d2 /Lib/test/test_support.py
parent9a4acdf4a5a33e85e880de094ae7d5b0786634c8 (diff)
downloadcpython-d989f820c880e7dff16293f6d2861330b5019130.zip
cpython-d989f820c880e7dff16293f6d2861330b5019130.tar.gz
cpython-d989f820c880e7dff16293f6d2861330b5019130.tar.bz2
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/test_support.py')
-rw-r--r--Lib/test/test_support.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 58c8455..6c2b2b2 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -1004,7 +1004,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))