Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 52daedb9778ab47d1a16d983515735c091cc696f
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sat Jan 19 00:27:44 2013 +0100
Fix tests
---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 3a18f43..6b1d71e 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -262,7 +262,7 @@ class Fedocallibtests(Modeltests):
meeting_time))
meeting_time = datetime.utcnow() - timedelta(hours=1)
- self.assertFalse(fedocallib.is_date_in_future(meeting_date,
+ self.assertFalse(fedocallib.is_date_in_future(meeting_time.date(),
meeting_time))
meeting_date = date.today() + timedelta(days=1)
@@ -270,7 +270,7 @@ class Fedocallibtests(Modeltests):
self.assertTrue(fedocallib.is_date_in_future(meeting_date,
meeting_time))
- meeting_date = date.today() - timedelta(days=1)
+ meeting_date = date.today() - timedelta(days=2)
self.assertFalse(fedocallib.is_date_in_future(meeting_date,
meeting_time))
@@ -931,7 +931,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited2',
- TODAY + timedelta(days=1), None,
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), 'pingou',
'Information2', 'EMEA', 'Europe/Paris',
None, None,
@@ -946,7 +946,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- TODAY + timedelta(days=1), None,
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), None,
'Information', 'EMEA', 'Europe/Paris',
None, None,
@@ -963,7 +963,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited2',
- TODAY + timedelta(days=1), None,
+ date.today() + timedelta(days=1), None,
time(22, 0), time(23, 0), None,
'Information', 'EMEA', 'Europe/Paris',
7, TODAY + timedelta(days=30),