[Python-checkins] r46868 - python/trunk/Lib/test/test_timeout.py python/trunk/Lib/test/test_urllib2net.py python/trunk/Lib/test/test_urllibnet.py

[neal.norwitz]

Author: neal.norwitz
Date: Sun Jun 11 22:25:56 2006
New Revision: 46868

Modified:
   python/trunk/Lib/test/test_timeout.py
   python/trunk/Lib/test/test_urllib2net.py
   python/trunk/Lib/test/test_urllibnet.py
Log:
Try to fix several networking tests.  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.


Modified: python/trunk/Lib/test/test_timeout.py
==============================================================================
--- python/trunk/Lib/test/test_timeout.py	(original)
+++ python/trunk/Lib/test/test_timeout.py	Sun Jun 11 22:25:56 2006
@@ -100,7 +100,7 @@
 
     def setUp(self):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.addr_remote = ('www.python.org', 80)
+        self.addr_remote = ('www.python.org.', 80)
         self.addr_local  = ('127.0.0.1', 25339)
 
     def tearDown(self):

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:25:56 2006
@@ -123,7 +123,7 @@
                           # domain will be spared to serve its defined
                           # purpose.
                           # urllib2.urlopen, "http://www.sadflkjsasadf.com/")
-                          urllib2.urlopen, "http://www.python.invalid/")
+                          urllib2.urlopen, "http://www.python.invalid./")
 
 
 class OtherNetworkTests(unittest.TestCase):

Modified: python/trunk/Lib/test/test_urllibnet.py
==============================================================================
--- python/trunk/Lib/test/test_urllibnet.py	(original)
+++ python/trunk/Lib/test/test_urllibnet.py	Sun Jun 11 22:25:56 2006
@@ -110,7 +110,7 @@
                           # domain will be spared to serve its defined
                           # purpose.
                           # urllib.urlopen, "http://www.sadflkjsasadf.com/")
-                          urllib.urlopen, "http://www.python.invalid/")
+                          urllib.urlopen, "http://www.python.invalid./")
 
 class urlretrieveNetworkTests(unittest.TestCase):
     """Tests urllib.urlretrieve using the network."""