From 380f76d35fa0350a37f17fbb2e2065f1e527cadd Mon Sep 17 00:00:00 2001 From: Jakob de Maeyer Date: Mon, 9 Nov 2015 16:54:22 +0100 Subject: [PATCH] Fix tests that had multiple calls to crawl() --- tests/test_crawl.py | 18 ++++++++++++------ tests/test_downloader_handlers.py | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/test_crawl.py b/tests/test_crawl.py index 814eb30d2..35de5527d 100644 --- a/tests/test_crawl.py +++ b/tests/test_crawl.py @@ -61,14 +61,16 @@ class CrawlTestCase(TestCase): @defer.inlineCallbacks def test_timeout_failure(self): - crawler = CrawlerRunner({"DOWNLOAD_TIMEOUT": 0.35}).create_crawler(DelaySpider) - yield crawler.crawl(n=0.5) + runner = CrawlerRunner({"DOWNLOAD_TIMEOUT": 0.35}) + crawler = runner.create_crawler(DelaySpider) + yield runner.crawl(crawler, n=0.5) self.assertTrue(crawler.spider.t1 > 0) self.assertTrue(crawler.spider.t2 == 0) self.assertTrue(crawler.spider.t2_err > 0) self.assertTrue(crawler.spider.t2_err > crawler.spider.t1) # server hangs after receiving response headers - yield crawler.crawl(n=0.5, b=1) + crawler = runner.create_crawler(DelaySpider) + yield runner.crawl(crawler, n=0.5, b=1) self.assertTrue(crawler.spider.t1 > 0) self.assertTrue(crawler.spider.t2 == 0) self.assertTrue(crawler.spider.t2_err > 0) @@ -131,11 +133,15 @@ class CrawlTestCase(TestCase): @defer.inlineCallbacks def test_start_requests_dupes(self): settings = {"CONCURRENT_REQUESTS": 1} - crawler = CrawlerRunner(settings).create_crawler(DuplicateStartRequestsSpider) - yield crawler.crawl(dont_filter=True, distinct_urls=2, dupe_factor=3) + runner = CrawlerRunner(settings) + crawler = runner.create_crawler(DuplicateStartRequestsSpider) + yield runner.crawl(crawler, dont_filter=True, distinct_urls=2, + dupe_factor=3) self.assertEqual(crawler.spider.visited, 6) - yield crawler.crawl(dont_filter=False, distinct_urls=3, dupe_factor=4) + crawler = runner.create_crawler(DuplicateStartRequestsSpider) + yield runner.crawl(crawler, dont_filter=False, distinct_urls=3, + dupe_factor=4) self.assertEqual(crawler.spider.visited, 3) @defer.inlineCallbacks diff --git a/tests/test_downloader_handlers.py b/tests/test_downloader_handlers.py index e4d957d8e..7feb6b9c1 100644 --- a/tests/test_downloader_handlers.py +++ b/tests/test_downloader_handlers.py @@ -308,6 +308,7 @@ class Http11MockServerTestCase(unittest.TestCase): # download_maxsize < 100, hence the CancelledError self.assertIsInstance(failure.value, defer.CancelledError) + crawler = get_crawler(SingleRequestSpider) request.headers.setdefault('Accept-Encoding', 'gzip,deflate') request = request.replace(url='http://localhost:8998/xpayload') yield crawler.crawl(seed=request)