From 2731494720ce3cfa4816e9f3c711bbc19316acde Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 14 Oct 2010 15:41:23 +0000 Subject: 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. ........ --- Lib/test/regrtest.py | 5 ++--- Lib/test/support.py | 2 +- Lib/test/test_io.py | 2 ++ Lib/test/test_tokenize.py | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index c2c44e5..cac3c8c 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -115,8 +115,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. @@ -178,7 +177,7 @@ if sys.platform == 'darwin': from test import support RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', - 'decimal', 'compiler', 'subprocess', 'urlfetch', 'gui') + 'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui') def usage(msg): diff --git a/Lib/test/support.py b/Lib/test/support.py index 34005e8..842cda6 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)) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 4c7ce31..fe361be 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -803,6 +803,7 @@ class BufferedReaderTest(unittest.TestCase, CommonBufferedTests): self.assertEquals(b"abcdefg", bufio.read()) + @support.requires_resource('cpu') def test_threads(self): try: # Write out many bytes with exactly the same number of 0's, @@ -1070,6 +1071,7 @@ class BufferedWriterTest(unittest.TestCase, CommonBufferedTests): with self.open(support.TESTFN, "rb", buffering=0) as f: self.assertEqual(f.read(), b"abc") + @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 eeefce1..5a25251 100644 --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -516,13 +516,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: -- cgit v0.12