summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_io.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-14 15:41:23 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-14 15:41:23 (GMT)
commit2731494720ce3cfa4816e9f3c711bbc19316acde (patch)
tree09e2669920003062416235922fdd9ad79f3c439e /Lib/test/test_io.py
parentc8ef6436d833b06f2b916127701abebb114ed38c (diff)
downloadcpython-2731494720ce3cfa4816e9f3c711bbc19316acde.zip
cpython-2731494720ce3cfa4816e9f3c711bbc19316acde.tar.gz
cpython-2731494720ce3cfa4816e9f3c711bbc19316acde.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_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 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