Merge branch 'fusion/alban'

1 files changed, 6 insertions, 8 deletions

diff --git a/tests.py b/tests.py
index be7b884..051c733 100644
--- a/tests.py
+++ b/tests.py
@@ -14,8 +14,6 @@
 #    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.test import TestCase
-from django.utils import timezone
-
 from .models import Course, Group, Timetable, Year
 from .utils import tz_now
 
@@ -130,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"))