diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-04-02 18:52:12 +0000 |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-04-02 18:52:12 +0000 |
| commit | 41fe6155394edf0ef65d125b27ceb8d1e37f72d3 (patch) | |
| tree | 68af315f367bba93ba4d7d370e755bccd79c047f /Lib/test/test_robotparser.py | |
| parent | 1bfd0cc5d40018a6dd9f279d6d7acb829c76cc8f (diff) | |
| download | cpython-git-41fe6155394edf0ef65d125b27ceb8d1e37f72d3.tar.gz | |
(partially)
Merged revisions 79534,79537,79539,79558,79606 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines
Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings.
........
r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines
Fix typo
........
r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines
Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests.
........
r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines
#7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines
Backport some robotparser test and skip the test if the external resource is not available.
........
Diffstat (limited to 'Lib/test/test_robotparser.py')
| -rw-r--r-- | Lib/test/test_robotparser.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py index 86ebe9fbea..4c3b5363fd 100644 --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -209,21 +209,19 @@ RobotTest(13, doc, good, bad, agent="googlebot") class NetworkTestCase(unittest.TestCase): def testPasswordProtectedSite(self): - if not support.is_resource_enabled('network'): - return - # whole site is password-protected. + support.requires('network') + # XXX it depends on an external resource which could be unavailable url = 'http://mueblesmoraleda.com' parser = urllib.robotparser.RobotFileParser() parser.set_url(url) try: parser.read() - self.assertEqual(parser.can_fetch("*", url+"/robots.txt"), False) except URLError: - self.skipTest('mueblesmoraleda.com is unavailable') + self.skipTest('%s is unavailable' % url) + self.assertEqual(parser.can_fetch("*", url+"/robots.txt"), False) def testPythonOrg(self): - if not support.is_resource_enabled('network'): - return + support.requires('network') parser = urllib.robotparser.RobotFileParser( "http://www.python.org/robots.txt") parser.read() |