Replace the "compiler" resource with the more generic "cpu", so

as to mark CPU-heavy tests.

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 64d0a7c27199ededfeb8b0151e1b963515c7d49f..9f18ea4bd50e62e576df0d93109477d758762850 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -138,8 +138,7 @@ resources to test.  Currently only the following are defined:
     decimal -   Test the decimal module against a large suite that
                 verifies compliance with standards.
 
-    compiler -  Allow test_tokenize to verify round-trip lexing on
-                every file in the test library.
+    cpu -       Used for certain CPU-heavy tests.
 
     subprocess  Run all tests for the subprocess module.
 
@@ -214,7 +213,7 @@ INTERRUPTED = -4
 from test import support
 
 RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network',
-                  'decimal', 'compiler', 'subprocess', 'urlfetch', 'gui')
+                  'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui')
 
 TEMPDIR = os.path.abspath(tempfile.gettempdir())
 

diff --git a/Lib/test/support.py b/Lib/test/support.py
index 1f6931734cfed59d4064174db481526d87f8e72c..e48f2b313c7657dfcf88278ecc4e0118346cb711 100644 (file)
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -1046,7 +1046,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))

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index dfddfb54a7fff280c940ac365651013069226233..8784e340017ddfc4aea641732d0762b38825887f 100644 (file)
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -837,6 +837,7 @@ class BufferedReaderTest(unittest.TestCase, CommonBufferedTests):
         self.assertEquals(b"abcdefg", bufio.read())
 
     @unittest.skipUnless(threading, 'Threading required for this test.')
+    @support.requires_resource('cpu')
     def test_threads(self):
         try:
             # Write out many bytes with exactly the same number of 0's,
@@ -1105,6 +1106,7 @@ class BufferedWriterTest(unittest.TestCase, CommonBufferedTests):
             self.assertEqual(f.read(), b"abc")
 
     @unittest.skipUnless(threading, 'Threading required for this test.')
+    @support.requires_resource('cpu')
     def test_threads(self):
         try:
             # Write out many bytes from many threads and test they were

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 4a82229e4d13e35685474e2e09cfd87db316a9f3..3f45d9c5d883ef5e3d5e50cd97c6f3c29220ed1a 100644 (file)
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -514,13 +514,13 @@ Two string literals on the same line
     True
 
 Test roundtrip on random python modules.
-pass the '-ucompiler' option to process the full directory.
+pass the '-ucpu' option to process the full directory.
 
     >>> import random
     >>> tempdir = os.path.dirname(f) or os.curdir
     >>> testfiles = glob.glob(os.path.join(tempdir, "test*.py"))
 
-    >>> if not support.is_resource_enabled("compiler"):
+    >>> if not support.is_resource_enabled("cpu"):
     ...     testfiles = random.sample(testfiles, 10)
     ...
     >>> for testfile in testfiles: