test: Use LogFormatter

open-contracting · Apr 11, 2024 · 2251815 · 2251815
1 parent c047bbd
commit 2251815
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -24,6 +24,9 @@ def response_fixture(meta=None, url_path='', **kwargs):
 
 
 def spider_with_crawler(spider_class=BaseSpider, *, settings=None, **kwargs):
+    if settings is None:
+        settings = {}
+    settings.update({'LOG_FORMATTER': 'kingfisher_scrapy.log_formatter.LogFormatter'})
     crawler = get_crawler(spider_class, settings)
     start_time = datetime(2001, 2, 3, 4, 5, 6)
     crawler.stats.set_value('start_time', start_time)

diff --git a/tests/test_spidermiddlewares.py b/tests/test_spidermiddlewares.py
@@ -553,10 +553,11 @@ async def test_validate_json_middleware(valid, klass, caplog):
         assert invalid_json_count == 0
         assert messages == []
     else:
+        number = ", 'number': 1" if klass is FileItem else ''
         assert invalid_json_count == 1
         assert messages == [
-            f"Dropped: Invalid JSON\n{klass.__name__}(file_name='test.json', url='http://test.com', data_type="
-            f"'release_package', data='{{\"broken\": }}', {'number=1, ' if klass is FileItem else ''}path='')"
+            "Dropped: Invalid JSON\n"
+            f"{{'file_name': 'test.json', 'url': 'http://test.com', 'data_type': 'release_package'{number}}}"
         ]