From 62f47b434b5e6c79a145d09b92fb727963f5cf33 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 30 May 2018 08:50:00 +0200 Subject: [PATCH 1/4] tests: improve import/export tests pep8ness (#24152) --- tests/test_import_export.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/test_import_export.py b/tests/test_import_export.py index afebd67..3e844c9 100644 --- a/tests/test_import_export.py +++ b/tests/test_import_export.py @@ -10,14 +10,14 @@ import pytest from django.core.management import call_command from django.utils.timezone import make_aware -from chrono.agendas.models import (Agenda, Event, MeetingType, TimePeriod, - Desk, TimePeriodException) -from chrono.manager.utils import export_site, import_site +from chrono.agendas.models import (Agenda, Event, TimePeriod, Desk, TimePeriodException) +from chrono.manager.utils import import_site from test_api import some_data, meetings_agenda, time_zone, mock_now pytestmark = pytest.mark.django_db + def get_output_of_command(command, *args, **kwargs): old_stdout = sys.stdout output = sys.stdout = StringIO() @@ -25,6 +25,7 @@ def get_output_of_command(command, *args, **kwargs): sys.stdout = old_stdout return output.getvalue() + def test_import_export(app, some_data, meetings_agenda): # add exception to meeting agenda desk = meetings_agenda.desk_set.first() @@ -64,8 +65,11 @@ def test_import_export(app, some_data, meetings_agenda): event = Event(agenda=agenda1, start_datetime=make_aware(datetime.datetime.now()), places=10) event.save() desk, _ = Desk.objects.get_or_create(agenda=agenda2, label='Desk A', slug='desk-a') - timeperiod = TimePeriod(weekday=2, desk=desk, - start_time=datetime.time(10, 0), end_time=datetime.time(11, 0)) + timeperiod = TimePeriod( + desk=desk, + weekday=2, + start_time=datetime.time(10, 0), + end_time=datetime.time(11, 0)) timeperiod.save() exception = TimePeriodException( desk=desk, @@ -81,8 +85,11 @@ def test_import_export(app, some_data, meetings_agenda): event = Event(agenda=agenda1, start_datetime=make_aware(datetime.datetime.now()), places=10) event.save() - timeperiod = TimePeriod(weekday=2, desk=desk, - start_time=datetime.time(10, 0), end_time=datetime.time(11, 0)) + timeperiod = TimePeriod( + weekday=2, + desk=desk, + start_time=datetime.time(10, 0), + end_time=datetime.time(11, 0)) timeperiod.save() exception = TimePeriodException( desk=desk, -- 2.17.0