Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions scrapy_webdriver/tests/test_request_queue.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
from functools import partial
import logging
from time import sleep

from mock import call, Mock
from scrapy.crawler import Crawler
from scrapy.crawler import CrawlerProcess
from scrapy.http import Request
from scrapy import log, signals
from scrapy.settings import Settings
from scrapy.spider import BaseSpider
from scrapy.xlib.pydispatch import dispatcher
from twisted.internet import reactor

from scrapy_webdriver.http import WebdriverRequest

Expand All @@ -32,9 +31,6 @@ def settings(self, **options):
settings.update(**options)
return settings

def _stop_reactor(self):
reactor.stop()

def _wait(self, url, *args, **kwargs):
sleep(0.1)

Expand All @@ -44,15 +40,10 @@ def test_priorization(self):
webdriver.get.side_effect = self._wait
webdriver.page_source = u''

dispatcher.connect(self._stop_reactor, signal=signals.spider_closed)

crawler = Crawler(Settings(values=settings))
crawler.configure()
spider = self.Spider(name='test', domain='testdomain')
crawler.crawl(spider)
crawler.start()
log.start(loglevel='ERROR')
reactor.run()
process = CrawlerProcess(Settings(values=settings))
process.crawl(self.Spider, name='test', domain='testdomain')
logging.getLogger('scrapy').setLevel(logging.ERROR)
process.start()

assert webdriver.get.mock_calls == [
call('http://testdomain/path?wr=0'),
Expand Down