Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 809477a2eaee7d3aec5b15198da41f2a33ac8ad8
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 17:27:52 2012 +0100
Fix unit-test for changes in agenda layout
---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 2c472d5..c71d329 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -184,7 +184,7 @@ class Fedocallibtests(Modeltests):
meetings = fedocallib.get_meetings(self.session, calendar)
self.assertNotEqual(meetings, None)
cnt = 0
- for meeting in meetings['19h - 20h']:
+ for meeting in meetings['19h00']:
if meeting is not None:
for meet in meeting:
self.assertTrue(meet.meeting_name in
@@ -193,14 +193,14 @@ class Fedocallibtests(Modeltests):
else:
cnt = cnt + 1
self.assertEqual(cnt, 6)
- self.assertEqual(meetings['15h - 16h'][0], None)
+ self.assertEqual(meetings['15h00'][0], None)
new_day = TODAY + timedelta(days=10)
meetings = fedocallib.get_meetings(self.session, calendar,
new_day.year, new_day.month, new_day.day)
self.assertNotEqual(meetings, None)
cnt = 0
- for meeting in meetings['14h - 15h']:
+ for meeting in meetings['14h00']:
if meeting is not None:
for meet in meeting:
self.assertEqual(meet.meeting_name, 'test-meeting2')
@@ -208,7 +208,7 @@ class Fedocallibtests(Modeltests):
cnt = cnt + 1
self.assertEqual(cnt, 6)
cnt = 0
- for meeting in meetings['15h - 16h']:
+ for meeting in meetings['15h00']:
if meeting is not None:
for meet in meeting:
self.assertEqual(meet.meeting_name, 'test-meeting2')
@@ -216,7 +216,7 @@ class Fedocallibtests(Modeltests):
cnt = cnt + 1
self.assertEqual(cnt, 6)
cnt = 0
- for meeting in meetings['02h - 03h']:
+ for meeting in meetings['02h00']:
if meeting is not None:
for meet in meeting:
self.assertEqual(meet.meeting_name,
@@ -224,7 +224,7 @@ class Fedocallibtests(Modeltests):
else:
cnt = cnt + 1
self.assertEqual(cnt, 6)
- self.assertEqual(meetings['19h - 20h'][0], None)
+ self.assertEqual(meetings['19h00'][0], None)
def test_get_meetings_with_multiple_same_time(self):
""" Test the get_meetings function when there are several
@@ -233,7 +233,7 @@ class Fedocallibtests(Modeltests):
calendar = model.Calendar.by_id(self.session, 'test_calendar4')
meetings = fedocallib.get_meetings(self.session, calendar)
cnt = 0
- for meeting in meetings['14h - 15h']:
+ for meeting in meetings['14h00']:
if meeting is not None:
for meet in meeting:
self.assertTrue(meet.meeting_name in
@@ -242,7 +242,7 @@ class Fedocallibtests(Modeltests):
cnt = cnt + 1
self.assertEqual(cnt, 6)
cnt = 0
- for meeting in meetings['15h - 16h']:
+ for meeting in meetings['15h00']:
if meeting is not None:
for meet in meeting:
self.assertTrue(meet.meeting_name in