From 4f6caa89b2df4d5b1533e3a271b2e8b291a43d60 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Wed, 27 Sep 2023 15:59:59 +0300 Subject: [PATCH 1/3] fix: Make sure groups in test have different acronyms Fixes #6393 --- ietf/secr/sreq/tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index 8d2c86a0d7..a43d96d51a 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -81,9 +81,9 @@ def test_cancel(self): def test_edit(self): meeting = MeetingFactory(type_id='ietf', date=date_today()) mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group - group2 = GroupFactory() - group3 = GroupFactory() - group4 = GroupFactory() + group2 = GroupFactory(acronym='group2') + group3 = GroupFactory(acronym='group3') + group4 = GroupFactory(acronym='group4') iabprog = GroupFactory(type_id='program') SessionFactory(meeting=meeting,group=mars,status_id='sched') @@ -144,6 +144,7 @@ def test_edit(self): r = self.client.post(url, post_data, HTTP_HOST='example.com') redirect_url = reverse('ietf.secr.sreq.views.view', kwargs={'acronym': 'mars'}) self.assertRedirects(r, redirect_url) + print(1, post_data) # Check whether updates were stored in the database sessions = Session.objects.filter(meeting=meeting, group=mars).order_by("id") # order to match edit() view @@ -162,6 +163,7 @@ def test_edit(self): # Check whether the updated data is visible on the view page r = self.client.get(redirect_url) + print(2, r.content) self.assertContains(r, 'Schedule the sessions on subsequent days') self.assertContains(r, 'Thursday early afternoon, Thursday late afternoon') self.assertContains(r, group2.acronym) From a469f08d63eb4f661a6066ed0541f2a989a6ab4b Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Wed, 27 Sep 2023 16:01:21 +0300 Subject: [PATCH 2/3] Remove debug prints --- ietf/secr/sreq/tests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index a43d96d51a..262848a34c 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -144,7 +144,6 @@ def test_edit(self): r = self.client.post(url, post_data, HTTP_HOST='example.com') redirect_url = reverse('ietf.secr.sreq.views.view', kwargs={'acronym': 'mars'}) self.assertRedirects(r, redirect_url) - print(1, post_data) # Check whether updates were stored in the database sessions = Session.objects.filter(meeting=meeting, group=mars).order_by("id") # order to match edit() view @@ -163,7 +162,6 @@ def test_edit(self): # Check whether the updated data is visible on the view page r = self.client.get(redirect_url) - print(2, r.content) self.assertContains(r, 'Schedule the sessions on subsequent days') self.assertContains(r, 'Thursday early afternoon, Thursday late afternoon') self.assertContains(r, group2.acronym) From 37e98d3b5c541e23d0cab5bbde9a3808e26101f0 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 28 Sep 2023 11:28:41 +0300 Subject: [PATCH 3/3] Fix the actual issue --- ietf/secr/sreq/tests.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index 262848a34c..7fb13f1796 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -81,9 +81,9 @@ def test_cancel(self): def test_edit(self): meeting = MeetingFactory(type_id='ietf', date=date_today()) mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group - group2 = GroupFactory(acronym='group2') - group3 = GroupFactory(acronym='group3') - group4 = GroupFactory(acronym='group4') + group2 = GroupFactory() + group3 = GroupFactory() + group4 = GroupFactory() iabprog = GroupFactory(type_id='program') SessionFactory(meeting=meeting,group=mars,status_id='sched') @@ -165,7 +165,8 @@ def test_edit(self): self.assertContains(r, 'Schedule the sessions on subsequent days') self.assertContains(r, 'Thursday early afternoon, Thursday late afternoon') self.assertContains(r, group2.acronym) - self.assertContains(r, 'Second session with: {} {}'.format(group3.acronym, group4.acronym)) + # The sessions can be in any order in the HTML, deal with that + self.assertRegex(r.content.decode(), r'Second session with: ({} {}|{} {})'.format(group3.acronym, group4.acronym, group4.acronym, group3.acronym)) # check that a notification was sent self.assertEqual(len(outbox), 1)