Scrapy, a fast high-level web crawling & scraping framework for Python.
Fix telnet warnings in tests
Konstantin Lopuhin92b504eae537
diff --git a/tests/test_crawler.py b/tests/test_crawler.pyindex d3b80f460..6a8e11363 100644--- a/tests/test_crawler.py+++ b/tests/test_crawler.py@@ -1,5 +1,4 @@import logging-import osimport tempfileimport warningsimport unittest@@ -14,8 +13,9 @@ from scrapy.spiderloader import SpiderLoaderfrom scrapy.utils.log import configure_logging, get_scrapy_root_handlerfrom scrapy.utils.spider import DefaultSpiderfrom scrapy.utils.misc import load_object-from scrapy.utils.test import get_crawlerfrom scrapy.extensions.throttle import AutoThrottle+from scrapy.extensions import telnet+class BaseCrawlerTest(unittest.TestCase):@@ -100,6 +100,8 @@ class CrawlerLoggingTestCase(unittest.TestCase):custom_settings = {'LOG_LEVEL': 'INFO','LOG_FILE': log_file.name,+ # disable telnet if not available to avoid an extra warning+ 'TELNETCONSOLE_ENABLED': telnet.TWISTED_CONCH_AVAILABLE,}configure_logging()diff --git a/tests/test_utils_log.py b/tests/test_utils_log.pyindex 45527b03b..742e04803 100644--- a/tests/test_utils_log.py+++ b/tests/test_utils_log.py@@ -10,6 +10,7 @@ from twisted.python.failure import Failurefrom scrapy.utils.log import (failure_to_exc_info, TopLevelFormatter,LogCounterHandler, StreamLogger)from scrapy.utils.test import get_crawler+from scrapy.extensions import telnetclass FailureToExcInfoTest(unittest.TestCase):@@ -65,10 +66,14 @@ class TopLevelFormatterTest(unittest.TestCase):class LogCounterHandlerTest(unittest.TestCase):def setUp(self):+ settings = {'LOG_LEVEL': 'WARNING'}+ if not telnet.TWISTED_CONCH_AVAILABLE:+ # disable it to avoid the extra warning+ settings['TELNETCONSOLE_ENABLED'] = Falseself.logger = logging.getLogger('test')self.logger.setLevel(logging.NOTSET)self.logger.propagate = False- self.crawler = get_crawler(settings_dict={'LOG_LEVEL': 'WARNING'})+ self.crawler = get_crawler(settings_dict=settings)self.handler = LogCounterHandler(self.crawler)self.logger.addHandler(self.handler)