From 640496deb262349101567de12d2476cbfe5065b3 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 14 Oct 2017 11:25:46 +0200 Subject: timezone.now() retourne l’heure UTC, ce qui empêche la mise à jour de la semaine prochaine le samedi à minuit. Remplacement de ces appels par une fonction qui retourne la bonne heure dans le bon fuseau horaire. --- tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests.py') diff --git a/tests.py b/tests.py index 1d23620..be7b884 100644 --- a/tests.py +++ b/tests.py @@ -17,11 +17,12 @@ from django.test import TestCase from django.utils import timezone from .models import Course, Group, Timetable, Year +from .utils import tz_now class CourseTestCase(TestCase): def setUp(self): - dt = timezone.now() + dt = tz_now() self.year = Year(name="L2", slug="l2") self.year.save() -- cgit v1.2.1 From fbf65db250dbc86b04cfcf6175e4b167e1be23f0 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Wed, 18 Oct 2017 13:37:36 +0200 Subject: Suppression des imports inutiles --- tests.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests.py') diff --git a/tests.py b/tests.py index be7b884..a3475ff 100644 --- a/tests.py +++ b/tests.py @@ -14,8 +14,6 @@ # along with celcatsanitizer. If not, see . from django.test import TestCase -from django.utils import timezone - from .models import Course, Group, Timetable, Year from .utils import tz_now -- cgit v1.2.1 From 9efb1796aed00f4c7a8c9cd7e6b8a169318b1be0 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Thu, 19 Oct 2017 21:48:39 +0200 Subject: Adaptation de corresponds_to() et des tests de parsage --- tests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests.py') diff --git a/tests.py b/tests.py index a3475ff..051c733 100644 --- a/tests.py +++ b/tests.py @@ -128,10 +128,10 @@ class GroupTestCase(TestCase): tdb2 = Group.objects.get(celcat_name="L1 info s2 TDB2", timetable=self.timetable) tpb21 = Group.objects.get(celcat_name="L1 info s2 TPB21", timetable=self.timetable) - self.assertEqual(cma.group_info, (self.timetable.id, "L1 info s2", "A", None, None)) - self.assertEqual(tda2.group_info, (self.timetable.id, "L1 info s2", "A", 2, None)) - self.assertEqual(tpa21.group_info, (self.timetable.id, "L1 info s2", "A", 2, 1)) + self.assertEqual(cma.group_info, (self.timetable.id, "L1 info", "A")) + self.assertEqual(tda2.group_info, (self.timetable.id, "L1 info", "A2")) + self.assertEqual(tpa21.group_info, (self.timetable.id, "L1 info", "A21")) - self.assertEqual(cmb.group_info, (self.timetable.id, "L1 info s2", "B", None, None)) - self.assertEqual(tdb2.group_info, (self.timetable.id, "L1 info s2", "B", 2, None)) - self.assertEqual(tpb21.group_info, (self.timetable.id, "L1 info s2", "B", 2, 1)) + self.assertEqual(cmb.group_info, (self.timetable.id, "L1 info", "B")) + self.assertEqual(tdb2.group_info, (self.timetable.id, "L1 info", "B2")) + self.assertEqual(tpb21.group_info, (self.timetable.id, "L1 info", "B21")) -- cgit v1.2.1