Issue 4814 - Adds csv log to formmail2

sitescripts/formmail/test/test_formmail2.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2017 eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 75 matching lines @@
     yield response_for
     remove_wsgi_intercept()
 
 
 @pytest.fixture
 def sm_mock(mocker):
     return mocker.patch('sitescripts.formmail.web.formmail2.sendMail')
 
 
 @pytest.mark.parametrize('key,message', [
-            ('url', 'No URL configured for form handler: test'),
-            ('fields', 'No fields configured for form handler: test'),
-            ('template', 'No template configured for form handler: test'),
-            ])
+    ('url', 'No URL configured for form handler: test'),
+    ('fields', 'No fields configured for form handler: test'),
+    ('template', 'No template configured for form handler: test'),
+])
 def test_config_errors(key, message, form_config):
     del form_config[key]
     with pytest.raises(Exception) as error:
         formmail2.make_handler('test', form_config)[1]
     assert error.value.message == message
 
 
 @pytest.mark.parametrize('field,message', [
-            (('new_field', 'foo'), 'Unexpected field/fields: new_field'),

[Sebastian Noack, 2017/03/23 15:27:58]

Nit: The indentation seems inconsistent here. I suppose it should be 4 instead
of 8 spaces. And the closing bracket below should be on the same column where
the line opening the list starts.

[Jon Sonesen, 2017/03/23 18:42:16]

Done.

-            (('mandatory', ''), 'No mandatory entered'),
-            (('non_mandatory_email', 'asfaf'), 'Invalid email'),
-            (('email', 'asfaf'), 'You failed the email validation'),
-            (('email', ''), 'You failed the email test'),
-            ])
+    (('new_field', 'foo'), 'Unexpected field/fields: new_field'),
+    (('mandatory', ''), 'No mandatory entered'),
+    (('non_mandatory_email', 'asfaf'), 'Invalid email'),
+    (('email', 'asfaf'), 'You failed the email validation'),
+    (('email', ''), 'You failed the email test'),
+])
 def test_http_errs(field, message, response_for, form_data, sm_mock):
     key, value = field
     form_data[key] = value
     with pytest.raises(HTTPError) as error:
         response_for(form_data)
     assert error.value.read() == message
 
 
 @pytest.mark.parametrize('field,expected', [
     (('non_mandatory_message', '\xc3\xb6'), (200, '')),
     (('non_mandatory_message', ''), (200, '')),
-    ])

[Sebastian Noack, 2017/03/23 15:27:58]

Nit: Same here, the closing bracket should be on the same column where the line
opening the list starts.

[Jon Sonesen, 2017/03/23 18:42:16]

Done.

+])
 def test_success(field, expected, log_path, response_for, form_data, sm_mock):
     key, value = field
     form_data[key] = value
     assert response_for(form_data, log=False) == expected
     assert sm_mock.call_count == 1
 
     params = sm_mock.call_args[0][1]['fields']
     assert set(params.keys()) == set(form_data.keys())
     for key, value in form_data.items():
         assert params[key] == value.decode('utf8')
@@ skipping 41 matching lines @@
         assert row != form_data
 
 
 def test_append_field_err(form_config, form_data, log_path):
     """ Checks that error logs are correctly written and appended
 
     Submits three forms, the second two have different fields to the first
     and should be added to the same log file as each other, and be identical
     """
     formmail2.log_formdata(form_data, log_path)
-    del(form_data['email'])

[Sebastian Noack, 2017/03/23 15:27:58]

Nit: del isn't a function, but a statement. So the parenthesis are redundant.

[Jon Sonesen, 2017/03/23 18:42:16]

Done.

+    del form_data['email']
 
     # submit two forms with fields that dont match the config
     # this should append the second form to the error log file
     with pytest.raises(Exception):
         formmail2.log_formdata(form_data, log_path)
     with pytest.raises(Exception):
         formmail2.log_formdata(form_data, log_path)
 
     with open(log_path + '_error') as error_log:
         reader = DictReader(error_log)
         assert reader.next() == form_data
         assert reader.next() == form_data