From: Gregory P. Smith Date: Mon, 1 Mar 2010 03:04:05 +0000 (+0000) Subject: Merged revisions 78532 via svnmerge from X-Git-Tag: v2.6.5rc1~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c234a3c74a3b4178027f2beff39dbe304450330b;p=python 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 a9723b18f3..7b5d519263 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -734,7 +734,7 @@ class ProcessTestCase(unittest.TestCase): self.assertNotEqual(p.wait(), 0) class HelperFunctionTests(unittest.TestCase): - def test_eintr_retry_call(self): + def _test_eintr_retry_call(self): record_calls = [] def fake_os_func(*args): record_calls.append(args) @@ -750,6 +750,9 @@ class HelperFunctionTests(unittest.TestCase): subprocess._eintr_retry_call(fake_os_func, 666)) self.assertEqual([(256, 999), (666,), (666,)], record_calls) + if not mswindows: + test_eintr_retry_call = _test_eintr_retry_call + def test_main(): test_support.run_unittest(ProcessTestCase,