From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 8 Jul 2011 17:40:15 +0000 (+0200)
Subject: Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
X-Git-Tag: v2.7.3rc1~625
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2960308c0c4e2a669e19dcb1a0d20184571f5a29;p=thirdparty%2FPython%2Fcpython.git

Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
Web site.
---

diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py
index 3376a8a3cb4b..b3d4a46056bb 100644
--- a/Lib/test/test_robotparser.py
+++ b/Lib/test/test_robotparser.py
@@ -1,5 +1,6 @@
 import unittest, StringIO, robotparser
 from test import test_support
+from urllib2 import urlopen, HTTPError
 
 class RobotTestCase(unittest.TestCase):
     def __init__(self, index, parser, url, good, agent):
@@ -234,13 +235,27 @@ class NetworkTestCase(unittest.TestCase):
         test_support.requires('network')
         with test_support.transient_internet('mueblesmoraleda.com'):
             url = 'http://mueblesmoraleda.com'
+            robots_url = url + "/robots.txt"
+            # First check the URL is usable for our purposes, since the
+            # test site is a bit flaky.
+            try:
+                urlopen(robots_url)
+            except HTTPError as e:
+                if e.code not in {401, 403}:
+                    self.skipTest(
+                        "%r should return a 401 or 403 HTTP error, not %r"
+                        % (robots_url, e.code))
+            else:
+                self.skipTest(
+                    "%r should return a 401 or 403 HTTP error, not succeed"
+                    % (robots_url))
             parser = robotparser.RobotFileParser()
             parser.set_url(url)
             try:
                 parser.read()
             except IOError:
                 self.skipTest('%s is unavailable' % url)
-            self.assertEqual(parser.can_fetch("*", url+"/robots.txt"), False)
+            self.assertEqual(parser.can_fetch("*", robots_url), False)
 
     def testPythonOrg(self):
         test_support.requires('network')
diff --git a/Misc/NEWS b/Misc/NEWS
index f7d12fc1d01a..9607a4dc79ac 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,10 @@ Build
 Tests
 -----
 
+- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
+  an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
+  Web site.
+
 - Avoid failing in test_urllibnet.test_bad_address when some overzealous
   DNS service (e.g. OpenDNS) resolves a non-existent domain name.  The test
   is now skipped instead.