From 6730e3c9f73f6864acdea51c88f6c2277b7ae439 Mon Sep 17 00:00:00 2001 From: Julia Medina Date: Mon, 9 Jun 2014 16:51:25 -0300 Subject: [PATCH] Fix settings usage across tests --- scrapy/tests/test_cmdline/extensions.py | 2 +- scrapy/tests/test_downloadermiddleware_robotstxt.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scrapy/tests/test_cmdline/extensions.py b/scrapy/tests/test_cmdline/extensions.py index a7acf1210..4d347966a 100644 --- a/scrapy/tests/test_cmdline/extensions.py +++ b/scrapy/tests/test_cmdline/extensions.py @@ -3,7 +3,7 @@ class TestExtension(object): def __init__(self, settings): - settings.overrides['TEST1'] = "%s + %s" % (settings['TEST1'], 'started') + settings.set('TEST1', "%s + %s" % (settings['TEST1'], 'started')) @classmethod def from_crawler(cls, crawler): diff --git a/scrapy/tests/test_downloadermiddleware_robotstxt.py b/scrapy/tests/test_downloadermiddleware_robotstxt.py index a98522510..31d7f0087 100644 --- a/scrapy/tests/test_downloadermiddleware_robotstxt.py +++ b/scrapy/tests/test_downloadermiddleware_robotstxt.py @@ -6,17 +6,17 @@ from twisted.trial import unittest from scrapy.contrib.downloadermiddleware.robotstxt import RobotsTxtMiddleware from scrapy.exceptions import IgnoreRequest, NotConfigured from scrapy.http import Request, Response -from scrapy.settings import CrawlerSettings +from scrapy.settings import Settings class RobotsTxtMiddlewareTest(unittest.TestCase): def test(self): crawler = mock.MagicMock() - crawler.settings = CrawlerSettings() - crawler.settings.overrides['USER_AGENT'] = 'CustomAgent' + crawler.settings = Settings() + crawler.settings.set('USER_AGENT', 'CustomAgent') self.assertRaises(NotConfigured, RobotsTxtMiddleware, crawler) - crawler.settings.overrides['ROBOTSTXT_OBEY'] = True + crawler.settings.set('ROBOTSTXT_OBEY', True) crawler.engine.download = mock.MagicMock() ROBOTS = re.sub(r'^\s+(?m)', '', ''' User-Agent: *