Pulling in corrections to tests.

 - Legacy-Id: 12460

Author: rjsparks

ietf/meeting/tests_views.py

@@ -835,6 +835,8 @@ def test_interim_request_single_virtual(self):
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
         length_before = len(outbox)
+        meeting_count = Meeting.objects.filter(number__contains='-%s-'%group.acronym, date__year=date.year).count()
+        next_num = "%02d" % (meeting_count+1)
         self.client.login(username="marschairman", password="marschairman+password")
         data = {'group':group.pk,
                 'meeting_type':'single',
@@ -857,7 +859,7 @@ def test_interim_request_single_virtual(self):
         meeting = Meeting.objects.order_by('id').last()
         self.assertEqual(meeting.type_id,'interim')
         self.assertEqual(meeting.date,date)
-        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year,group.acronym,'01'))
+        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year, group.acronym, next_num))
         self.assertEqual(meeting.city,'')
         self.assertEqual(meeting.country,'')
         self.assertEqual(meeting.time_zone,'UTC')
@@ -891,6 +893,8 @@ def test_interim_request_single_in_person(self):
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
+        meeting_count = Meeting.objects.filter(number__contains='-%s-'%group.acronym, date__year=date.year).count()
+        next_num = "%02d" % (meeting_count+1)
         self.client.login(username="secretary", password="secretary+password")
         data = {'group':group.pk,
                 'meeting_type':'single',
@@ -912,7 +916,7 @@ def test_interim_request_single_in_person(self):
         meeting = Meeting.objects.order_by('id').last()
         self.assertEqual(meeting.type_id,'interim')
         self.assertEqual(meeting.date,date)
-        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year,group.acronym,'01'))
+        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year, group.acronym, next_num))
         self.assertEqual(meeting.city,city)
         self.assertEqual(meeting.country,country)
         self.assertEqual(meeting.time_zone,time_zone)
@@ -938,6 +942,8 @@ def test_interim_request_multi_day(self):
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
+        meeting_count = Meeting.objects.filter(number__contains='-%s-'%group.acronym, date__year=date.year).count()
+        next_num = "%02d" % (meeting_count+1)
         self.client.login(username="secretary", password="secretary+password")
         data = {'group':group.pk,
                 'meeting_type':'multi-day',
@@ -965,7 +971,7 @@ def test_interim_request_multi_day(self):
         meeting = Meeting.objects.order_by('id').last()
         self.assertEqual(meeting.type_id,'interim')
         self.assertEqual(meeting.date,date)
-        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year,group.acronym,'01'))
+        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year, group.acronym, next_num))
         self.assertEqual(meeting.city,city)
         self.assertEqual(meeting.country,country)
         self.assertEqual(meeting.time_zone,time_zone)
@@ -1001,6 +1007,9 @@ def test_interim_request_series(self):
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
+        meeting_count = Meeting.objects.filter(number__contains='-%s-'%group.acronym, date__year=date.year).count()
+        next_num = "%02d" % (meeting_count+1)
+        next_num2 = "%02d" % (meeting_count+2)
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(urlreverse("ietf.meeting.views.interim_request"))
         self.assertEqual(r.status_code, 200)
@@ -1035,7 +1044,7 @@ def test_interim_request_series(self):
         meeting = meetings[1]
         self.assertEqual(meeting.type_id,'interim')
         self.assertEqual(meeting.date,date)
-        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year,group.acronym,'01'))
+        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year, group.acronym, next_num))
         self.assertEqual(meeting.city,city)
         self.assertEqual(meeting.country,country)
         self.assertEqual(meeting.time_zone,time_zone)
@@ -1050,7 +1059,7 @@ def test_interim_request_series(self):
         meeting = meetings[0]
         self.assertEqual(meeting.type_id,'interim')
         self.assertEqual(meeting.date,date2)
-        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date2.year,group.acronym,'02'))
+        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date2.year, group.acronym, next_num2))
         self.assertEqual(meeting.city,city)
         self.assertEqual(meeting.country,country)
         self.assertEqual(meeting.time_zone,time_zone)