From 364790eb07f835e34bbd5876889b1bb3583bffe8 Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Wed, 19 Mar 2014 03:30:58 +0600 Subject: [PATCH] scrapy.utils.test.docrawl function --- scrapy/tests/test_closespider.py | 8 +------- scrapy/tests/test_crawl.py | 8 +------- scrapy/tests/test_proxy_connect.py | 7 +------ scrapy/utils/test.py | 7 +++++++ 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/scrapy/tests/test_closespider.py b/scrapy/tests/test_closespider.py index 2759e4ff3..c6622d486 100644 --- a/scrapy/tests/test_closespider.py +++ b/scrapy/tests/test_closespider.py @@ -1,16 +1,10 @@ from twisted.internet import defer from twisted.trial.unittest import TestCase -from scrapy.utils.test import get_crawler +from scrapy.utils.test import docrawl from scrapy.tests.spiders import FollowAllSpider, ItemSpider, ErrorSpider from scrapy.tests.mockserver import MockServer -def docrawl(spider, settings=None): - crawler = get_crawler(settings) - crawler.configure() - crawler.crawl(spider) - return crawler.start() - class TestCloseSpider(TestCase): def setUp(self): diff --git a/scrapy/tests/test_crawl.py b/scrapy/tests/test_crawl.py index e6edb4dda..a8847aa40 100644 --- a/scrapy/tests/test_crawl.py +++ b/scrapy/tests/test_crawl.py @@ -3,19 +3,13 @@ import socket import mock from twisted.internet import defer from twisted.trial.unittest import TestCase -from scrapy.utils.test import get_crawler, get_testlog +from scrapy.utils.test import docrawl, get_testlog from scrapy.tests.spiders import FollowAllSpider, DelaySpider, SimpleSpider, \ BrokenStartRequestsSpider, SingleRequestSpider from scrapy.tests.mockserver import MockServer from scrapy.http import Request -def docrawl(spider, settings=None): - crawler = get_crawler(settings) - crawler.crawl(spider) - return crawler.start() - - class CrawlTestCase(TestCase): def setUp(self): diff --git a/scrapy/tests/test_proxy_connect.py b/scrapy/tests/test_proxy_connect.py index ee9576f71..e0b47a3dc 100644 --- a/scrapy/tests/test_proxy_connect.py +++ b/scrapy/tests/test_proxy_connect.py @@ -8,16 +8,11 @@ from netlib import http_auth from twisted.internet import defer from twisted.trial.unittest import TestCase -from scrapy.utils.test import get_crawler, get_testlog +from scrapy.utils.test import get_testlog, docrawl from scrapy.tests.spiders import SimpleSpider from scrapy.tests.mockserver import MockServer -def docrawl(spider, settings=None): - crawler = get_crawler(settings) - crawler.configure() - crawler.crawl(spider) - return crawler.start() diff --git a/scrapy/utils/test.py b/scrapy/utils/test.py index ec9ca1c51..6106976b1 100644 --- a/scrapy/utils/test.py +++ b/scrapy/utils/test.py @@ -67,3 +67,10 @@ def assert_samelines(testcase, text1, text2, msg=None): line endings between platforms """ testcase.assertEqual(text1.splitlines(), text2.splitlines(), msg) + +def docrawl(spider, settings=None): + """Configure and start Crawler; return the result of crawler.start()""" + crawler = get_crawler(settings) + crawler.configure() + crawler.crawl(spider) + return crawler.start()