From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 31 Jan 2009 01:42:55 +0000 (+0000)
Subject: check the errno in bad fd cases
X-Git-Tag: v2.7a1~2162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1de05e9b2ae00b27b10de274a4903bc1cc365098;p=thirdparty%2FPython%2Fcpython.git

check the errno in bad fd cases
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 81d1671b4bf2..4180d0600dcb 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -3,6 +3,7 @@
 # portable than they had been thought to be.
 
 import os
+import errno
 import unittest
 import warnings
 import sys
@@ -249,7 +250,6 @@ class StatAttributeTests(unittest.TestCase):
             result = os.statvfs(self.fname)
         except OSError, e:
             # On AtheOS, glibc always returns ENOSYS
-            import errno
             if e.errno == errno.ENOSYS:
                 return
 
@@ -549,7 +549,13 @@ class TestInvalidFD(unittest.TestCase):
         locals()["test_"+f] = get_single(f)
 
     def check(self, f, *args):
-        self.assertRaises(OSError, f, test_support.make_bad_fd(), *args)
+        try:
+            f(test_support.make_bad_fd(), *args)
+        except OSError as e:
+            self.assertEqual(e.errno, errno.EBADF)
+        else:
+            self.fail("%r didn't raise a OSError with a bad file descriptor"
+                      % f)
 
     def test_isatty(self):
         if hasattr(os, "isatty"):