Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit e13c497bca664233c6749df8b10621ef778f2167
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Wed Nov 28 15:43:52 2012 +0100
Fix unit-tests and coverage
This fix the unit-tests for the change to the edit_meeting
Additionnaly, fix the coverage of the API and the fedocallib to remain to
100%
---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 11 ++++-------
fedocal/tests/test_fedocallib.py | 31 ++++++++++++++++++++++---------
fedocal/tests/test_flask_api.py | 4 ++--
fedocal/tests/test_meeting.py | 8 ++++----
4 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 2fb43ff..f1d8730 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -701,13 +701,13 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
'The start date of your meeting is later than the end date.')
meeting_time_start = convert_time(
- datetime(meeting_date_end.year, meeting_date_end.month,
- meeting_date_end.day,
+ datetime(meeting_date.year, meeting_date.month, meeting_date.day,
meeting_time_start.hour,
meeting_time_start.minute),
tzone, 'UTC')
meeting_time_stop = convert_time(
- datetime(meeting_date.year, meeting_date.month, meeting_date.day,
+ datetime(meeting_date_end.year, meeting_date_end.month,
+ meeting_date_end.day,
meeting_time_stop.hour,
meeting_time_stop.minute),
tzone, 'UTC')
@@ -719,10 +719,7 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
comanager)
meeting.meeting_date = meeting_time_start.date()
- meeting_end_date = meeting_time_stop.date()
- if not meeting_end_date:
- meeting_end_date = meeting_time_start.date()
- meeting.meeting_end_date = meeting_end_date
+ meeting.meeting_date_end = meeting_time_stop.date()
meeting.meeting_time_start = meeting_time_start.time()
meeting.meeting_time_stop = meeting_time_stop.time()
meeting.meeting_information = meeting_information
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 0dc3bff..cf1d108 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -852,7 +852,7 @@ class Fedocallibtests(Modeltests):
self.assertRaises(UserNotAllowed, fedocallib.edit_meeting,
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), None,
'Information', 'EMEA', 'Europe/Paris',
None, None,
@@ -864,7 +864,7 @@ class Fedocallibtests(Modeltests):
self.assertRaises(InvalidMeeting, fedocallib.edit_meeting,
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- date.today() - timedelta(days=2),
+ date.today() - timedelta(days=2), None,
time(23, 0), time(23, 59), None,
'Information', 'EMEA', 'UTC',
None, None,
@@ -874,17 +874,27 @@ class Fedocallibtests(Modeltests):
self.assertRaises(InvalidMeeting, fedocallib.edit_meeting,
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), None,
time(23, 0), time(21, 59), None,
'Information', 'EMEA', 'Europe/Paris',
None, None,
None, None)
self.session.rollback()
+ self.assertRaises(InvalidMeeting, fedocallib.edit_meeting,
+ self.session, meeting, calendarobj, fasuser,
+ 'Fedora-fr-meeting_edited',
+ date.today() + timedelta(days=1), date.today(),
+ time(23, 0), time(23, 59), None,
+ 'Information', 'EMEA', 'Europe/Paris',
+ None, None,
+ None, None)
+ self.session.rollback()
+
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), None,
'Information', 'EMEA', 'Europe/Paris',
None, None,
@@ -899,7 +909,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited2',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), 'pingou',
'Information2', 'EMEA', 'Europe/Paris',
None, None,
@@ -914,7 +924,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), None,
'Information', 'EMEA', 'Europe/Paris',
None, None,
@@ -931,7 +941,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), None,
'Information', 'EMEA', 'Europe/Paris',
7, TODAY + timedelta(days=30),
@@ -949,7 +959,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited2',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), None,
'Information2', None, 'Europe/Paris',
None, None,
@@ -968,7 +978,8 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Test meeting with reminder-2',
- date.today() + timedelta(days=1),
+ date.today() + timedelta(days=1), date.today() + timedelta(
+ days=3),
time(23, 0), time(23, 59), None,
'Information2', None, 'Europe/Paris',
None, None,
@@ -981,6 +992,8 @@ class Fedocallibtests(Modeltests):
self.assertEqual(meeting.meeting_information, 'Information2')
self.assertEqual(meeting.reminder.reminder_offset, 'H-24')
self.assertEqual(meeting.reminder.reminder_to, 'test(a)example.org')
+ self.assertEqual(meeting.meeting_date_end, date.today() + \
+ timedelta(days=3))
if __name__ == '__main__':
diff --git a/fedocal/tests/test_flask_api.py b/fedocal/tests/test_flask_api.py
index 1e5b1a9..c14da7c 100644
--- a/fedocal/tests/test_flask_api.py
+++ b/fedocal/tests/test_flask_api.py
@@ -181,7 +181,7 @@ class FlaskApitests(Modeltests):
def test_api_place(self):
""" Test the api_place function. """
- end_date = TODAY + timedelta(days=2)
+ end_date = TODAY + timedelta(days=25)
output = self.app.get('/api/place/EMEA/foobar/%s/%s' % (TODAY,
end_date))
self.assertEqual(output.status_code, 301)
@@ -210,7 +210,7 @@ class FlaskApitests(Modeltests):
TODAY, end_date))
self.assertEqual(output.status_code, 200)
self.assertTrue('"retrieval": "ok"' in output.data)
- self.assertEqual(output.data.count('meeting_name'), 1)
+ self.assertEqual(output.data.count('meeting_name'), 2)
end_date = TODAY + timedelta(days=1)
diff --git a/fedocal/tests/test_meeting.py b/fedocal/tests/test_meeting.py
index 82c3bfb..92cd8b8 100644
--- a/fedocal/tests/test_meeting.py
+++ b/fedocal/tests/test_meeting.py
@@ -61,8 +61,8 @@ class Meetingtests(Modeltests):
meeting_manager='pingou, shaiton,',
meeting_date=TODAY,
meeting_date_end=TODAY,
- meeting_time_start=time(19, 45),
- meeting_time_stop=time(20, 45),
+ meeting_time_start=time(19, 50),
+ meeting_time_stop=time(20, 50),
meeting_information='This is a test meeting',
calendar_name='test_calendar')
obj.save(self.session)
@@ -314,8 +314,8 @@ class Meetingtests(Modeltests):
'"meeting_manager": "pingou, shaiton,",\n '\
'"meeting_date": "%s",\n '\
'"meeting_date_end": "%s",\n '\
- '"meeting_time_start": "19:45:00",\n '\
- '"meeting_time_stop": "20:45:00",\n '\
+ '"meeting_time_start": "19:50:00",\n '\
+ '"meeting_time_stop": "20:50:00",\n '\
'"meeting_information": "This is a test meeting",\n
'\
'"meeting_region": "None",\n '\
'"calendar_name": "test_calendar"\n'\