[Python-checkins] r46869 - python/trunk/Lib/test/test_urllib2net.py

[neal.norwitz]

Author: neal.norwitz
Date: Sun Jun 11 22:42:02 2006
New Revision: 46869

Modified:
   python/trunk/Lib/test/test_urllib2net.py
Log:
Try to fix another networking test.  The problem is that if hosts have
a search path setup, some of these hosts resolve to the wrong address.
By appending a period to the hostname, the hostname should only resolve
to what we want it to resolve to.  Hopefully this doesn't break different bots.

Also add more info to failure message to aid debugging test failure.


Modified: python/trunk/Lib/test/test_urllib2net.py
==============================================================================
--- python/trunk/Lib/test/test_urllib2net.py	(original)
+++ python/trunk/Lib/test/test_urllib2net.py	Sun Jun 11 22:42:02 2006
@@ -160,8 +160,8 @@
                                 "urllib2$")
         urls = [
             # Thanks to Fred for finding these!
-            'gopher://gopher.lib.ncsu.edu/11/library/stacks/Alex',
-            'gopher://gopher.vt.edu:10010/10/33',
+            'gopher://gopher.lib.ncsu.edu./11/library/stacks/Alex',
+            'gopher://gopher.vt.edu.:10010/10/33',
             ]
         self._test_urls(urls, self._extra_handlers())
 
@@ -239,7 +239,9 @@
             except (IOError, socket.error, OSError), err:
                 debug(err)
                 if expected_err:
-                    self.assert_(isinstance(err, expected_err))
+                    msg = ("Didn't get expected error(s) %s for %s %s, got %s" %
+                           (expected_err, url, req, err))
+                    self.assert_(isinstance(err, expected_err), msg)
             else:
                 buf = f.read()
                 f.close()
@@ -259,7 +261,6 @@
         return handlers
 
 
-
 def test_main():
     test_support.requires("network")
     test_support.run_unittest(URLTimeoutTest, urlopenNetworkTests,