summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_io.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-03-28 18:38:37 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-03-28 18:38:37 (GMT)
commit9db55004a1bc0c0b3efca69dcd577ff58a86ea16 (patch)
treef54e4634fe90ad07b2a7c7650a2a06d4327fa4ae /Lib/test/test_io.py
parentd7aa5248fb577c7f46d4c0c9b064392bf5c17403 (diff)
downloadcpython-9db55004a1bc0c0b3efca69dcd577ff58a86ea16.zip
cpython-9db55004a1bc0c0b3efca69dcd577ff58a86ea16.tar.gz
cpython-9db55004a1bc0c0b3efca69dcd577ff58a86ea16.tar.bz2
Make some tests more frienly to MemoryError.
Free memory, unlock hanging threads.
Diffstat (limited to 'Lib/test/test_io.py')
-rw-r--r--Lib/test/test_io.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 5b2bf46..ec19562 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3514,11 +3514,16 @@ class SignalsTest(unittest.TestCase):
# received (forcing a first EINTR in write()).
read_results = []
write_finished = False
+ error = None
def _read():
- while not write_finished:
- while r in select.select([r], [], [], 1.0)[0]:
- s = os.read(r, 1024)
- read_results.append(s)
+ try:
+ while not write_finished:
+ while r in select.select([r], [], [], 1.0)[0]:
+ s = os.read(r, 1024)
+ read_results.append(s)
+ except BaseException as exc:
+ nonlocal error
+ error = exc
t = threading.Thread(target=_read)
t.daemon = True
def alarm1(sig, frame):
@@ -3539,6 +3544,8 @@ class SignalsTest(unittest.TestCase):
wio.flush()
write_finished = True
t.join()
+
+ self.assertIsNone(error)
self.assertEqual(N, sum(len(x) for x in read_results))
finally:
write_finished = True