From 648f700ed11ec9ab45cf91fae940e4f8b8aeb0fd Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Thu, 26 Aug 2010 23:23:58 -0300 Subject: [PATCH] Fixed log formatter tests --HG-- rename : scrapy/tests/test_contrib_logformatter.py => scrapy/tests/test_logformatter.py --- ...contrib_logformatter.py => test_logformatter.py} | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) rename scrapy/tests/{test_contrib_logformatter.py => test_logformatter.py} (61%) diff --git a/scrapy/tests/test_contrib_logformatter.py b/scrapy/tests/test_logformatter.py similarity index 61% rename from scrapy/tests/test_contrib_logformatter.py rename to scrapy/tests/test_logformatter.py index e096f7359..e4560215e 100644 --- a/scrapy/tests/test_contrib_logformatter.py +++ b/scrapy/tests/test_logformatter.py @@ -1,20 +1,25 @@ import unittest +from scrapy.spider import BaseSpider from scrapy.http import Request, Response -from scrapy.contrib.logformatter import crawled_logline +from scrapy.logformatter import LogFormatter class LoggingContribTest(unittest.TestCase): - def test_crawled_logline(self): + def setUp(self): + self.formatter = LogFormatter() + self.spider = BaseSpider('default') + + def test_crawled(self): req = Request("http://www.example.com") res = Response("http://www.example.com") - self.assertEqual(crawled_logline(req, res), + self.assertEqual(self.formatter.crawled(req, res, self.spider), "Crawled (200) (referer: None)") req = Request("http://www.example.com", headers={'referer': 'http://example.com'}) res = Response("http://www.example.com", flags=['cached']) - self.assertEqual(crawled_logline(req, res), + self.assertEqual(self.formatter.crawled(req, res, self.spider), "Crawled (200) (referer: http://example.com) ['cached']")