Merged revisions 78524 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78524 | gregory.p.smith | 2010-02-28 16:17:40 -0800 (Sun, 28 Feb 2010) | 10 lines

  Merged revisions 78523 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78523 | gregory.p.smith | 2010-02-28 16:05:08 -0800 (Sun, 28 Feb 2010) | 3 lines

    Issue #1068268: The subprocess module now handles EINTR in internal
    os.waitpid and os.read system calls where appropriate.
  ........
................
This commit is contained in:
Gregory P. Smith 2010-03-01 00:43:08 +00:00
parent 48a5ec42a8
commit 3fff44d1c9
3 changed files with 36 additions and 3 deletions

View file

@ -4,6 +4,7 @@ import subprocess
import sys
import signal
import os
import errno
import tempfile
import time
import re
@ -814,6 +815,25 @@ if getattr(subprocess, '_has_poll', False):
unit_tests.append(ProcessTestCaseNoPoll)
class HelperFunctionTests(unittest.TestCase):
def test_eintr_retry_call(self):
record_calls = []
def fake_os_func(*args):
record_calls.append(args)
if len(record_calls) == 2:
raise OSError(errno.EINTR, "fake interrupted system call")
return tuple(reversed(args))
self.assertEqual((999, 256),
subprocess._eintr_retry_call(fake_os_func, 256, 999))
self.assertEqual([(256, 999)], record_calls)
# This time there will be an EINTR so it will loop once.
self.assertEqual((666,),
subprocess._eintr_retry_call(fake_os_func, 666))
self.assertEqual([(256, 999), (666,), (666,)], record_calls)
unit_tests.append(HelperFunctionTests)
def test_main():
support.run_unittest(*unit_tests)
support.reap_children()