PY3 fix UserAgentMiddleware tests

This commit is contained in:
Mikhail Korobov 2015-09-01 04:11:33 +05:00
parent 3a9c73bc5d
commit c44cafe4f5
3 changed files with 6 additions and 6 deletions

View File

@ -20,4 +20,4 @@ class UserAgentMiddleware(object):
def process_request(self, request, spider):
if self.user_agent:
request.headers.setdefault('User-Agent', self.user_agent)
request.headers.setdefault(b'User-Agent', self.user_agent)

View File

@ -12,7 +12,6 @@ tests/test_downloadermiddleware_httpproxy.py
tests/test_downloadermiddleware.py
tests/test_downloadermiddleware_redirect.py
tests/test_downloadermiddleware_retry.py
tests/test_downloadermiddleware_useragent.py
tests/test_engine.py
tests/test_mail.py
tests/test_pipeline_files.py

View File

@ -17,7 +17,7 @@ class UserAgentMiddlewareTest(TestCase):
spider, mw = self.get_spider_and_mw('default_useragent')
req = Request('http://scrapytest.org/')
assert mw.process_request(req, spider) is None
self.assertEquals(req.headers['User-Agent'], 'default_useragent')
self.assertEquals(req.headers['User-Agent'], b'default_useragent')
def test_remove_agent(self):
# settings UESR_AGENT to None should remove the user agent
@ -34,15 +34,16 @@ class UserAgentMiddlewareTest(TestCase):
mw.spider_opened(spider)
req = Request('http://scrapytest.org/')
assert mw.process_request(req, spider) is None
self.assertEquals(req.headers['User-Agent'], 'spider_useragent')
self.assertEquals(req.headers['User-Agent'], b'spider_useragent')
def test_header_agent(self):
spider, mw = self.get_spider_and_mw('default_useragent')
spider.user_agent = 'spider_useragent'
mw.spider_opened(spider)
req = Request('http://scrapytest.org/', headers={'User-Agent': 'header_useragent'})
req = Request('http://scrapytest.org/',
headers={'User-Agent': 'header_useragent'})
assert mw.process_request(req, spider) is None
self.assertEquals(req.headers['User-Agent'], 'header_useragent')
self.assertEquals(req.headers['User-Agent'], b'header_useragent')
def test_no_agent(self):
spider, mw = self.get_spider_and_mw(None)