From: Gregory P. Smith <greg@mad-scientist.com>
Date: Mon, 1 Mar 2010 02:58:43 +0000 (+0000)
Subject: Merged revisions 78533 via svnmerge from
X-Git-Tag: v3.1.2rc1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cab28180bb2bdfa21fa8e1a7162d26e0107f89b;p=python

Merged revisions 78533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78533 | gregory.p.smith | 2010-02-28 18:56:44 -0800 (Sun, 28 Feb 2010) | 9 lines

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

  ........
    r78532 | gregory.p.smith | 2010-02-28 18:53:24 -0800 (Sun, 28 Feb 2010) | 2 lines

    Fix the new test on windows (skip it, its posix only)
  ........
................
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 4db8033ac7..9ab06dc4e8 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -816,6 +816,7 @@ if getattr(subprocess, '_has_poll', False):
 
 
 class HelperFunctionTests(unittest.TestCase):
+    @unittest.skipIf(mswindows, "errno and EINTR make no sense on windows")
     def test_eintr_retry_call(self):
         record_calls = []
         def fake_os_func(*args):