Mov mock_logger setup into fixture

diff --git a/tests/views/test_upload.py b/tests/views/test_upload.py
index 678fd4851659a845b55c2b76459a975510cc6e09..b1acf6549e8e148dda37fe669ae2b442583fc96c 100644 (file)
--- a/tests/views/test_upload.py
+++ b/tests/views/test_upload.py
@@ -68,6 +68,10 @@ def isolate_upload_view(monkeypatch):
         monkeypatch.setattr(
             upload, 'TableUploadHandler', MockTableUploadHandler)
 
+        mock_logger = MockLogger()
+        monkeypatch.setattr(upload, 'log', mock_logger)
+        return mock_logger
+
     return run
 
 
@@ -78,11 +82,8 @@ def isolate_upload_view(monkeypatch):
 def test_upload_view_db_not_changed(monkeypatch, isolate_upload_view):
     '''When the db did not change nothing logs'''
 
-    mock_logger = MockLogger()
-    monkeypatch.setattr(upload, 'log', mock_logger)
-
     response = {'db_changed': False}
-    isolate_upload_view(response)
+    mock_logger = isolate_upload_view(response)
     result = upload.upload_view(None)
 
     assert result == response
@@ -92,9 +93,6 @@ def test_upload_view_db_not_changed(monkeypatch, isolate_upload_view):
 def test_upload_view_db_changed(monkeypatch, isolate_upload_view):
     '''When the db did change something logs'''
 
-    mock_logger = MockLogger()
-    monkeypatch.setattr(upload, 'log', mock_logger)
-
     response = {
         'csv_checked': form_constants.CHECKED,
         'db': 'somedb',
@@ -107,7 +105,7 @@ def test_upload_view_db_changed(monkeypatch, isolate_upload_view):
         'upload_null': form_constants.CHECKED,
         'user': 'someuser',
     }
-    isolate_upload_view(response)
+    mock_logger = isolate_upload_view(response)
     result = upload.upload_view(None)
 
     assert result == response