Scrapy, a fast high-level web crawling & scraping framework for Python.
[httpcompression] skip test if no brotli
Pawel Miech3daf473686aa
diff --git a/scrapy/downloadermiddlewares/httpcompression.py b/scrapy/downloadermiddlewares/httpcompression.pyindex 04c9e355d..2fc1bb8eb 100644--- a/scrapy/downloadermiddlewares/httpcompression.py+++ b/scrapy/downloadermiddlewares/httpcompression.py@@ -27,7 +27,7 @@ class HttpCompressionMiddleware(object):def process_request(self, request, spider):request.headers.setdefault('Accept-Encoding',- ",".join(ACCEPTED_ENCODINGS))+ b",".join(ACCEPTED_ENCODINGS))def process_response(self, request, response, spider):diff --git a/tests/requirements.txt b/tests/requirements.txtindex 9d0c3c996..9baa4be21 100644--- a/tests/requirements.txt+++ b/tests/requirements.txt@@ -6,6 +6,7 @@ pytest==2.9.2pytest-twistedpytest-cov==2.2.1jmespath+brotlipy==0.6testfixtures# optional for shell wrapper testsbpythondiff --git a/tests/test_downloadermiddleware_httpcompression.py b/tests/test_downloadermiddleware_httpcompression.pyindex b47b267e2..7924fb3b5 100644--- a/tests/test_downloadermiddleware_httpcompression.py+++ b/tests/test_downloadermiddleware_httpcompression.py@@ -1,11 +1,12 @@from io import BytesIO-from unittest import TestCase+from unittest import TestCase, SkipTestfrom os.path import joinfrom gzip import GzipFilefrom scrapy.spiders import Spiderfrom scrapy.http import Response, Request, HtmlResponse-from scrapy.downloadermiddlewares.httpcompression import HttpCompressionMiddleware+from scrapy.downloadermiddlewares.httpcompression import HttpCompressionMiddleware, \+ ACCEPTED_ENCODINGSfrom tests import tests_datadirfrom w3lib.encoding import resolve_encoding@@ -53,7 +54,7 @@ class HttpCompressionTest(TestCase):assert 'Accept-Encoding' not in request.headersself.mw.process_request(request, self.spider)self.assertEqual(request.headers.get('Accept-Encoding'),- b'gzip,deflate,br')+ b','.join(ACCEPTED_ENCODINGS))def test_process_response_gzip(self):response = self._getresponse('gzip')@@ -66,6 +67,10 @@ class HttpCompressionTest(TestCase):assert 'Content-Encoding' not in newresponse.headersdef test_process_response_br(self):+ try:+ import brotli+ except ImportError:+ raise SkipTest("no brotli")response = self._getresponse('br')request = response.requestself.assertEqual(response.headers['Content-Encoding'], b'br')