From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 11 Jun 2006 20:46:46 +0000 (+0000)
Subject: Fix test on PPC64 buildbot.  It raised an IOError (really an URLError which
X-Git-Tag: v2.5b1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=896c1ea15e9ec67fd1b33998ba8daaf17528ba31;p=thirdparty%2FPython%2Fcpython.git

Fix test on PPC64 buildbot.  It raised an IOError (really an URLError which
derives from an IOError).  That seems valid.  Env Error includes both OSError
and IOError, so this seems like a reasonable fix.
---

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 03b883b87d2e..00cf202b04fc 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -176,7 +176,7 @@ class OtherNetworkTests(unittest.TestCase):
 
                 # XXX bug, should raise URLError
                 #('file://nonsensename/etc/passwd', None, urllib2.URLError)
-                ('file://nonsensename/etc/passwd', None, (OSError, socket.error))
+                ('file://nonsensename/etc/passwd', None, (EnvironmentError, socket.error))
                 ]
             self._test_urls(urls, self._extra_handlers())
         finally: