family: fix logging for orleans loader (#15016)

This commit is contained in:
Serghei Mihai 2017-02-16 11:44:04 +01:00
parent d5eb97f181
commit fc1d1babcc
3 changed files with 13 additions and 2 deletions

View File

@ -175,7 +175,7 @@ class Loader(object):
invoice.write_pdf(archive.read(invoice_filename))
except Exception, e:
logger.error('Error occured while importing data: %s', e)
self.connector.logger.error('Error occured while importing data: %s', e)
Family.objects.filter(resource=self.connector, update_timestamp__lte=import_start_timestamp).delete()
Adult.objects.filter(family__resource=self.connector, update_timestamp__lte=import_start_timestamp).delete()

Binary file not shown.

View File

@ -4,6 +4,7 @@ import pytest
import os
from uuid import uuid4
import zipfile
import logging
from django.core.exceptions import ValidationError
from django.core.files import File
@ -277,7 +278,6 @@ def test_orleans_concerto_loader():
assert Invoice.objects.filter(resource=resource, total_amount=0).count() == 2
assert Invoice.objects.filter(online_payment=True).count() == 26
def test_orleans_data_import_command():
with pytest.raises(CommandError) as error:
call_command('import_orleans_data')
@ -324,3 +324,14 @@ def test_orleans_data_import_command():
assert Adult.objects.all().count() > 0
assert Child.objects.all().count() > 0
assert Invoice.objects.filter(resource=resource).count() > 0
def test_incorrect_orleans_data(caplog):
filepath = os.path.join(os.path.dirname(__file__), 'data',
'family_incorrect_data_orleans.zip')
resource = GenericFamily.objects.create(title='test orleans',
slug='test-orleans', archive=filepath,
file_format='concerto_orleans')
for record in caplog.records():
assert 'Error occured while importing data:' in record.message
assert record.name == 'passerelle.resource.genericfamily.test-orleans'
assert record.levelno == logging.ERROR