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.
This commit is contained in:
Neal Norwitz 2006-06-11 20:42:02 +00:00
parent a29fc29f19
commit f054aeb2a1

View file

@ -160,8 +160,8 @@ def test_gopher(self):
"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 @@ def _test_urls(self, urls, handlers):
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 @@ def _extra_handlers(self):
return handlers
def test_main():
test_support.requires("network")
test_support.run_unittest(URLTimeoutTest, urlopenNetworkTests,