From 6cbe68477cbdb6b9ca3145e609e68db947641e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Wed, 21 Aug 2013 19:04:12 -0300 Subject: [PATCH] do no include ResponseFailed if http11 handler is not enabled --- scrapy/tests/test_downloadermiddleware_retry.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scrapy/tests/test_downloadermiddleware_retry.py b/scrapy/tests/test_downloadermiddleware_retry.py index c398afdba..c5732dc4d 100644 --- a/scrapy/tests/test_downloadermiddleware_retry.py +++ b/scrapy/tests/test_downloadermiddleware_retry.py @@ -1,9 +1,9 @@ import unittest - from twisted.internet.error import TimeoutError as ServerTimeoutError, \ DNSLookupError, ConnectionRefusedError, ConnectionDone, ConnectError, \ ConnectionLost +from scrapy import optional_features from scrapy.contrib.downloadermiddleware.retry import RetryMiddleware from scrapy.xlib.tx import ResponseFailed from scrapy.spider import BaseSpider @@ -64,9 +64,13 @@ class RetryTest(unittest.TestCase): assert self.mw.process_response(req, rsp, self.spider) is rsp def test_twistederrors(self): - for exc in (ServerTimeoutError, DNSLookupError, ConnectionRefusedError, - ConnectionDone, ConnectError, ConnectionLost, - ResponseFailed): + exceptions = [ServerTimeoutError, DNSLookupError, + ConnectionRefusedError, ConnectionDone, ConnectError, + ConnectionLost] + if 'http11' in optional_features: + exceptions.append(ResponseFailed) + + for exc in exceptions: req = Request('http://www.scrapytest.org/%s' % exc.__name__) self._test_retry_exception(req, exc('foo'))