entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 34 Releases Activity

portfolio: use repr in log statements (#23657)

This commit is contained in:
Thomas NOËL 2018-05-09 10:45:37 +02:00
parent 277a858dc8
commit 97672e11b1
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/test_form_pages.py
View File

@ -2759,7 +2759,10 @@ def test_formdata_generated_document_odt_to_pdf_download(pub):
@pytest.mark.skipif(transform_to_pdf is None, reason='libreoffice not found')
def test_formdata_generated_document_odt_to_pdf_download_push_to_portfolio(pub, fargo_url,
fargo_secret, caplog):
create_user(pub)
user = create_user(pub)
user.name = 'Foo Baré'
user.store()
pub.cfg['debug'] = {'logger': True}
pub.write_cfg()
wf = Workflow(name='status')
@ -2801,7 +2804,7 @@ def test_formdata_generated_document_odt_to_pdf_download_push_to_portfolio(pub,
http_post_request.return_value = None, 200, 'null', None
resp = resp.form.submit('button_export_to')
assert http_post_request.call_count == 1
assert ('file template.pdf pushed to portfolio of foo@localhost'
assert ("file 'template.pdf' pushed to portfolio of 'Foo Bar\\xc3\\xa9'"
== caplog.records[-1].message)
resp = resp.follow() # $form/$id/create_doc
@ -2809,6 +2812,20 @@ def test_formdata_generated_document_odt_to_pdf_download_push_to_portfolio(pub,
assert resp.content_type == 'application/pdf'
assert 'PDF' in resp.body
resp = login(get_app(pub), username='foo', password='foo').get(form_location)
with mock.patch('wcs.portfolio.http_post_request') as http_post_request:
http_post_request.return_value = None, 400, 'null', None # fail
resp = resp.form.submit('button_export_to')
assert http_post_request.call_count == 1
assert ("file 'template.pdf' failed to be pushed to portfolio of 'Foo Bar\\xc3\\xa9'"
== caplog.records[-1].message)
# failed to push to portfolio, but document is here
resp = resp.follow() # $form/$id/create_doc
resp = resp.follow() # $form/$id/create_doc/
assert resp.content_type == 'application/pdf'
assert 'PDF' in resp.body
export_to.attach_to_history = True
wf.store()
@ -2817,7 +2834,7 @@ def test_formdata_generated_document_odt_to_pdf_download_push_to_portfolio(pub,
http_post_request.return_value = None, 200, 'null', None
resp = resp.form.submit('button_export_to')
assert http_post_request.call_count == 1
assert ('file template.pdf pushed to portfolio of foo@localhost'
assert ("file 'template.pdf' pushed to portfolio of 'Foo Bar\\xc3\\xa9'"
== caplog.records[-1].message)
assert resp.location == form_location
resp = resp.follow() # back to form page

8
wcs/portfolio.py
View File

@ -98,11 +98,11 @@ def push_document(user, filename, stream):
status = 0
status, resp = async_post()
if status == 200:
get_logger().info('file %s pushed to portfolio of %s'
% (filename, user.display_name))
get_logger().info('file %r pushed to portfolio of %r',
filename, user.display_name)
else:
get_logger().error('%s failed to be pushed to portfolio of %s'
% (filename, user.display_name))
get_logger().error('file %r failed to be pushed to portfolio of %r',
filename, user.display_name)
get_response().add_after_job(
N_('Sending file %(filename)s in portfolio of %(user_name)s') % {