From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 18 Sep 2010 18:16:39 +0000 (+0000)
Subject: Merged revisions 84878 via svnmerge from
X-Git-Tag: v3.1.3rc1~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f61045fd151c9726c03384152bfac39753e2308f;p=thirdparty%2FPython%2Fcpython.git

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

........
  r84878 | antoine.pitrou | 2010-09-18 19:56:02 +0200 (sam., 18 sept. 2010) | 5 lines

  Issue #9894: Do not hardcode ENOENT in test_subprocess.

  (GNU/Hurd is not dead)
........
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 64fbe2189d8f..a23f9345cfa0 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -535,7 +535,7 @@ class ProcessTestCase(BaseTestCase):
                                  stderr=subprocess.PIPE)
             # Windows raises IOError
             except (IOError, OSError) as err:
-                if err.errno != 2:  # ignore "no such file"
+                if err.errno != errno.ENOENT:  # ignore "no such file"
                     raise
 
     def test_issue8780(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 293228064017..f1fd78e8ba04 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -590,6 +590,8 @@ Build
 Tests
 -----
 
+- Issue #9894: Do not hardcode ENOENT in test_subprocess.
+
 - Issue #9315: Added tests for the trace module.  Patch by Eli Bendersky.
 
 - Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.