[Python-checkins] r67796 - in python/branches/release26-maint: Lib/test/test_urllib2_localnet.py Lib/test/test_urllibnet.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Dec 15 18:48:36 2008
New Revision: 67796

Log:
Merged revisions 67777,67779 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67777 | antoine.pitrou | 2008-12-14 23:33:55 +0100 (dim., 14 déc. 2008) | 3 lines
  
  try to fix failure in test_bad_address on some buildbots
........
  r67779 | antoine.pitrou | 2008-12-15 01:39:51 +0100 (lun., 15 déc. 2008) | 1 line
  
  modify other occurrence of test_bad_address
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_urllib2_localnet.py
   python/branches/release26-maint/Lib/test/test_urllibnet.py

Modified: python/branches/release26-maint/Lib/test/test_urllib2_localnet.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_urllib2_localnet.py	(original)
+++ python/branches/release26-maint/Lib/test/test_urllib2_localnet.py	Mon Dec 15 18:48:36 2008
@@ -474,7 +474,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://sadflkjsasf.i.nvali.d/")
 
 
 def test_main():

Modified: python/branches/release26-maint/Lib/test/test_urllibnet.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_urllibnet.py	(original)
+++ python/branches/release26-maint/Lib/test/test_urllibnet.py	Mon Dec 15 18:48:36 2008
@@ -137,7 +137,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://sadflkjsasf.i.nvali.d/")
 
 class urlretrieveNetworkTests(unittest.TestCase):
     """Tests urllib.urlretrieve using the network."""