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

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Dec 15 18:48:30 2008
New Revision: 67795

Log:
Merged revisions 67794 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r67794 | antoine.pitrou | 2008-12-15 14:08:55 +0100 (lun., 15 déc. 2008) | 13 lines
  
  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/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/test/test_urllib2_localnet.py
   python/branches/release30-maint/Lib/test/test_urllibnet.py

Modified: python/branches/release30-maint/Lib/test/test_urllib2_localnet.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_urllib2_localnet.py	(original)
+++ python/branches/release30-maint/Lib/test/test_urllib2_localnet.py	Mon Dec 15 18:48:30 2008
@@ -449,7 +449,7 @@
                           # domain will be spared to serve its defined
                           # purpose.
                           urllib.request.urlopen,
-                          "http://www.python.invalid./")
+                          "http://sadflkjsasf.i.nvali.d/")
 
 def test_main():
     support.run_unittest(ProxyAuthTests)

Modified: python/branches/release30-maint/Lib/test/test_urllibnet.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_urllibnet.py	(original)
+++ python/branches/release30-maint/Lib/test/test_urllibnet.py	Mon Dec 15 18:48:30 2008
@@ -139,7 +139,7 @@
                           # purpose.
                           # urllib.urlopen, "http://www.sadflkjsasadf.com/")
                           urllib.request.urlopen,
-                          "http://www.python.invalid./")
+                          "http://sadflkjsasf.i.nvali.d/")
 
 class urlretrieveNetworkTests(unittest.TestCase):
     """Tests urllib.request.urlretrieve using the network."""