Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge branch 'master' into asyncio-parse-asyncgen-proper-rebased
Andrey Rahmatullina0681fb81120
diff --cc tests/test_crawl.pyindex cefa79156,59c271868..c11871745--- a/tests/test_crawl.py+++ b/tests/test_crawl.py@@@ -489,26 -477,9 +493,26 @@@ class CrawlSpiderTestCase(TestCase)for req_id in range(3):self.assertIn(f"Got response 200, req_id {req_id}", str(log))+ @mark.only_not_asyncio()+ @defer.inlineCallbacks+ def test_async_def_deferred_direct(self):+ _, items, _ = yield self._run_spider(AsyncDefDeferredDirectSpider)+ self.assertEqual(items, [{'code': 200}])++ @mark.only_asyncio()+ @defer.inlineCallbacks+ def test_async_def_deferred_wrapped(self):+ log, items, _ = yield self._run_spider(AsyncDefDeferredWrappedSpider)+ self.assertEqual(items, [{'code': 200}])++ @defer.inlineCallbacks+ def test_async_def_deferred_maybe_wrapped(self):+ _, items, _ = yield self._run_spider(AsyncDefDeferredMaybeWrappedSpider)+ self.assertEqual(items, [{'code': 200}])+@defer.inlineCallbacksdef test_response_ssl_certificate_none(self):- crawler = self.runner.create_crawler(SingleRequestSpider)+ crawler = get_crawler(SingleRequestSpider)url = self.mockserver.url("/echo?body=test", is_secure=False)yield crawler.crawl(seed=url, mockserver=self.mockserver)self.assertIsNone(crawler.spider.meta['responses'][0].certificate)diff --cc tests/test_utils_python.pyindex 19143b31f,7dec5624a..00b06b839--- a/tests/test_utils_python.py+++ b/tests/test_utils_python.py@@@ -2,7 -2,7 +2,8 @@@ import functoolimport gcimport operatorimport platform+ import unittest+from datetime import datetimefrom itertools import countfrom warnings import catch_warnings, filterwarnings