removed another instance of scrapy.conf singleton, this time from test_cmdline

This commit is contained in:
Pablo Hoffman 2012-09-11 16:37:55 -03:00
parent 8642645109
commit 7ace23c385
2 changed files with 8 additions and 8 deletions

View File

@ -20,14 +20,14 @@ class CmdlineTest(unittest.TestCase):
def test_default_settings(self):
self.assertEqual(self._execute('settings', '--get', 'TEST1'), \
'default + loaded + started')
'default + started')
def test_override_settings_using_set_arg(self):
self.assertEqual(self._execute('settings', '--get', 'TEST1', '-s', 'TEST1=override'), \
'override + loaded + started')
'override + started')
def test_override_settings_using_envvar(self):
self.env['SCRAPY_TEST1'] = 'override'
self.assertEqual(self._execute('settings', '--get', 'TEST1'), \
'override + loaded + started')
'override + started')

View File

@ -1,10 +1,10 @@
"""A test extension used to check the settings loading order"""
from scrapy.conf import settings
settings.overrides['TEST1'] = "%s + %s" % (settings['TEST1'], 'loaded')
class TestExtension(object):
def __init__(self):
def __init__(self, settings):
settings.overrides['TEST1'] = "%s + %s" % (settings['TEST1'], 'started')
@classmethod
def from_crawler(cls, crawler):
return cls(crawler.settings)