summaryrefslogtreecommitdiff
path: root/Lib/test/test_io.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-14 15:43:25 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-14 15:43:25 +0000
commitd989f820c880e7dff16293f6d2861330b5019130 (patch)
tree7f87e5e2c2ba73991c20ae7f4fd7e72384c318d2 /Lib/test/test_io.py
parent9a4acdf4a5a33e85e880de094ae7d5b0786634c8 (diff)
downloadcpython-git-d989f820c880e7dff16293f6d2861330b5019130.tar.gz
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_io.py')
-rw-r--r--Lib/test/test_io.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 38cbcbcc2b..2b4a3a95da 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -812,6 +812,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,
@@ -1081,6 +1082,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