From 2b811b3d3db0bea5be5f19419f35b9924790d48b Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 4 Mar 2019 20:08:48 +0000 Subject: [PATCH] Updated the tests to always use @ietf.org addresses where appropriate, and not do so when not appropriate. All test user login addresses have been changed away from @ietf.org. - Legacy-Id: 15988 --- ietf/doc/tests_charter.py | 36 ++++++++++++++++++------------------ ietf/doc/tests_review.py | 12 ++++++------ ietf/group/tests_info.py | 24 ++++++++++++------------ ietf/stats/tests.py | 4 ++-- ietf/utils/tests.py | 12 ++++++------ 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py index 130590c39..960ea661a 100644 --- a/ietf/doc/tests_charter.py +++ b/ietf/doc/tests_charter.py @@ -68,10 +68,10 @@ class EditCharterTests(TestCase): area = GroupFactory(type_id='area') RoleFactory(name_id='ad',group=area,person=Person.objects.get(user__username='ad')) - ames = GroupFactory(acronym='ames',state_id='proposed',list_email='ames-wg@ietf.org',parent=area) + ames = GroupFactory(acronym='ames',state_id='proposed',list_email='ames-wg@example.org',parent=area) RoleFactory(name_id='ad',group=ames,person=Person.objects.get(user__username='ad')) - RoleFactory(name_id='chair',group=ames,person__name=u'Ames Man',person__user__email='ameschairman@ietf.org') - RoleFactory(name_id='secr',group=ames,person__name=u'Secretary',person__user__email='amessecretary@ietf.org') + RoleFactory(name_id='chair',group=ames,person__name=u'Ames Man',person__user__email='ameschairman@example.org') + RoleFactory(name_id='secr',group=ames,person__name=u'Secretary',person__user__email='amessecretary@example.org') CharterFactory(group=ames) mars = GroupFactory(acronym='mars',parent=area) @@ -130,10 +130,10 @@ class EditCharterTests(TestCase): self.assertIn("iesg@", outbox[-3]['To']) self.assertIn("A new IETF WG", outbox[-3].get_payload()) body = outbox[-3].get_payload() - for word in ["Chairs", "Ames Man ", - "Secretaries", "Secretary ", - "Assigned Area Director", "Areað Irector ", - "Mailing list", "ames-wg@ietf.org", + for word in ["Chairs", "Ames Man ", + "Secretaries", "Secretary ", + "Assigned Area Director", "Areað Irector ", + "Mailing list", "ames-wg@example.org", "Charter", "Milestones"]: self.assertIn(word, body) @@ -196,7 +196,7 @@ class EditCharterTests(TestCase): # does the unusual state sequence of: intrev --> extrev --> intrev area = GroupFactory(type_id='area') RoleFactory(name_id='ad',group=area,person=Person.objects.get(user__username='ad')) - group = GroupFactory(acronym='ames',state_id='proposed',list_email='ames-wg@ietf.org',parent=area) + group = GroupFactory(acronym='ames',state_id='proposed',list_email='ames-wg@example.org',parent=area) CharterFactory(group=group) charter = group.charter @@ -416,7 +416,7 @@ class EditCharterTests(TestCase): "Windows line\nMac line\nUnix line\n" + utf_8_snippet) def test_submit_initial_charter(self): - group = GroupFactory(type_id='wg',acronym='mars',list_email='mars-wg@ietf.org') + group = GroupFactory(type_id='wg',acronym='mars',list_email='mars-wg@example.org') url = urlreverse('ietf.doc.views_charter.submit', kwargs=dict(name=charter_name_for_group(group))) login_testing_unauthorized(self, "secretary", url) @@ -444,7 +444,7 @@ class EditCharterTests(TestCase): def test_edit_review_announcement_text(self): area = GroupFactory(type_id='area') RoleFactory(name_id='ad',group=area,person=Person.objects.get(user__username='ad')) - charter = CharterFactory(group__parent=area,group__list_email='mars-wg@ietf.org') + charter = CharterFactory(group__parent=area,group__list_email='mars-wg@example.org') group = charter.group url = urlreverse('ietf.doc.views_charter.review_announcement_text', kwargs=dict(name=charter.name)) @@ -589,10 +589,10 @@ class EditCharterTests(TestCase): def test_approve(self): area = GroupFactory(type_id='area') RoleFactory(name_id='ad',group=area,person=Person.objects.get(user__username='ad')) - charter = CharterFactory(group__acronym='ames',group__list_email='ames-wg@ietf.org',group__parent=area,group__state_id='bof') + charter = CharterFactory(group__acronym='ames',group__list_email='ames-wg@example.org',group__parent=area,group__state_id='bof') group = charter.group - RoleFactory(name_id='chair',group=group,person__name=u'Ames Man',person__user__email='ameschairman@ietf.org') - RoleFactory(name_id='secr',group=group,person__name=u'Secretary',person__user__email='amessecretary@ietf.org') + RoleFactory(name_id='chair',group=group,person__name=u'Ames Man',person__user__email='ameschairman@example.org') + RoleFactory(name_id='secr',group=group,person__name=u'Secretary',person__user__email='amessecretary@example.org') url = urlreverse('ietf.doc.views_charter.approve', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) @@ -665,12 +665,12 @@ class EditCharterTests(TestCase): # self.assertTrue("WG Action" in outbox[1]['Subject']) self.assertTrue("ietf-announce" in outbox[1]['To']) - self.assertTrue("ames-wg@ietf.org" in outbox[1]['Cc']) + self.assertTrue("ames-wg@example.org" in outbox[1]['Cc']) body = outbox[1].get_payload() - for word in ["Chairs", "Ames Man ", - "Secretaries", "Secretary ", - "Assigned Area Director", "Areað Irector ", - "Area Directors", "Mailing list", "ames-wg@ietf.org", + for word in ["Chairs", "Ames Man ", + "Secretaries", "Secretary ", + "Assigned Area Director", "Areað Irector ", + "Area Directors", "Mailing list", "ames-wg@example.org", "Charter", "/doc/charter-ietf-ames/", "Milestones"]: self.assertIn(word, body) diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py index ccc6534f8..c3db0bd3a 100644 --- a/ietf/doc/tests_review.py +++ b/ietf/doc/tests_review.py @@ -32,7 +32,7 @@ from ietf.review.utils import reviewer_rotation_list, possibly_advance_next_revi from ietf.utils.test_utils import TestCase from ietf.utils.test_data import create_person from ietf.utils.test_utils import login_testing_unauthorized, unicontent, reload_db_objects -from ietf.utils.mail import outbox, empty_outbox +from ietf.utils.mail import outbox, empty_outbox, parseaddr from ietf.person.factories import PersonFactory class ReviewTests(TestCase): @@ -632,9 +632,9 @@ class ReviewTests(TestCase): self.assertEqual(f.read(), "This is a review\nwith two lines") self.assertEqual(len(outbox), 1) - self.assertTrue(review_req.team.list_email in outbox[0]["To"]) - self.assertTrue(review_req.reviewer.role_set.filter(group=review_req.team,name='reviewer').first().email.address in outbox[0]["From"]) - self.assertTrue("This is a review" in outbox[0].get_payload(decode=True).decode("utf-8")) + self.assertIn(review_req.team.list_email, outbox[0]["To"]) + self.assertIn(review_req.reviewer.person.plain_name(), parseaddr(outbox[0]["From"])[0]) + self.assertIn("This is a review", outbox[0].get_payload(decode=True).decode("utf-8")) self.assertTrue(settings.MAILING_LIST_ARCHIVE_URL in review_req.review.external_url) @@ -644,8 +644,8 @@ class ReviewTests(TestCase): # Check that we have a copy of the outgoing message msgid = outbox[0]["Message-ID"] message = Message.objects.get(msgid=msgid) - self.assertEqual(email.utils.parseaddr(outbox[0]["To"]), email.utils.parseaddr(message.to)) - self.assertEqual(email.utils.parseaddr(outbox[0]["From"]), email.utils.parseaddr(message.frm)) + self.assertEqual(parseaddr(outbox[0]["To"]), parseaddr(message.to)) + self.assertEqual(parseaddr(outbox[0]["From"]), parseaddr(message.frm)) self.assertEqual(outbox[0].get_payload(decode=True).decode(str(outbox[0].get_charset())), message.body) # check the review document page diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py index 6827cf5f8..01b3e7160 100644 --- a/ietf/group/tests_info.py +++ b/ietf/group/tests_info.py @@ -548,8 +548,8 @@ class GroupEditTests(TestCase): def test_edit_info(self): group = GroupFactory(acronym='mars',parent=GroupFactory(type_id='area')) CharterFactory(group=group) - RoleFactory(group=group,name_id='chair',person__user__email='marschairman@ietf.org') - RoleFactory(group=group,name_id='delegate',person__user__email='marsdelegate@ietf.org') + RoleFactory(group=group,name_id='chair',person__user__email='marschairman@example.org') + RoleFactory(group=group,name_id='delegate',person__user__email='marsdelegate@example.org') url = urlreverse('ietf.group.views.edit', kwargs=dict(group_type=group.type_id, acronym=group.acronym, action="edit")) login_testing_unauthorized(self, "secretary", url) @@ -594,10 +594,10 @@ class GroupEditTests(TestCase): parent=area.pk, ad=ad.pk, state=state.pk, - chair_roles="aread@ietf.org, ad1@ietf.org", - secr_roles="aread@ietf.org, ad1@ietf.org, ad2@ietf.org", - techadv_roles="aread@ietf.org", - delegate_roles="ad2@ietf.org", + chair_roles="aread@example.org, ad1@example.org", + secr_roles="aread@example.org, ad1@example.org, ad2@example.org", + techadv_roles="aread@example.org", + delegate_roles="ad2@example.org", list_email="mars@mail", list_subscribe="subscribe.mars", list_archive="archive.mars", @@ -610,8 +610,8 @@ class GroupEditTests(TestCase): self.assertEqual(group.parent, area) self.assertEqual(group.ad_role().person, ad) for k in ("chair", "secr", "techadv"): - self.assertTrue(group.role_set.filter(name=k, email__address="aread@ietf.org")) - self.assertTrue(group.role_set.filter(name="delegate", email__address="ad2@ietf.org")) + self.assertTrue(group.role_set.filter(name=k, email__address="aread@example.org")) + self.assertTrue(group.role_set.filter(name="delegate", email__address="ad2@example.org")) self.assertEqual(group.list_email, "mars@mail") self.assertEqual(group.list_subscribe, "subscribe.mars") self.assertEqual(group.list_archive, "archive.mars") @@ -681,7 +681,7 @@ class GroupEditTests(TestCase): parent=group.parent_id, ad=Person.objects.get(name="Areað Irector").pk, state=group.state_id, - reviewer_roles="ad2@ietf.org", + reviewer_roles="ad2@example.org", list_email=group.list_email, list_subscribe=group.list_subscribe, list_archive=group.list_archive, @@ -690,7 +690,7 @@ class GroupEditTests(TestCase): self.assertEqual(r.status_code, 302) group = reload_db_objects(group) - self.assertEqual(list(group.role_set.filter(name="reviewer").values_list("email", flat=True)), ["ad2@ietf.org"]) + self.assertEqual(list(group.role_set.filter(name="reviewer").values_list("email", flat=True)), ["ad2@example.org"]) self.assertTrue('Personnel change' in outbox[0]['Subject']) def test_conclude(self): @@ -1107,11 +1107,11 @@ class EmailAliasesTests(TestCase): self.group_alias_file.write("""# Generated by hand at 2015-02-12_16:30:52 virtual.ietf.org anything mars-ads@ietf.org xfilter-mars-ads -expand-mars-ads@virtual.ietf.org aread@ietf.org +expand-mars-ads@virtual.ietf.org aread@example.org mars-chairs@ietf.org xfilter-mars-chairs expand-mars-chairs@virtual.ietf.org mars_chair@ietf.org ames-ads@ietf.org xfilter-mars-ads -expand-ames-ads@virtual.ietf.org aread@ietf.org +expand-ames-ads@virtual.ietf.org aread@example.org ames-chairs@ietf.org xfilter-mars-chairs expand-ames-chairs@virtual.ietf.org mars_chair@ietf.org """) diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py index 69880ed10..ee7571f4b 100644 --- a/ietf/stats/tests.py +++ b/ietf/stats/tests.py @@ -34,8 +34,8 @@ class StatisticsTests(TestCase): draft = WgDraftFactory() DocumentAuthor.objects.create( document=draft, - person=Person.objects.get(email__address="aread@ietf.org"), - email=Email.objects.get(address="aread@ietf.org"), + person=Person.objects.get(email__address="aread@example.org"), + email=Email.objects.get(address="aread@example.org"), country="Germany", affiliation="IETF", order=1 diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py index 801ac7ef7..60d9bc07e 100644 --- a/ietf/utils/tests.py +++ b/ietf/utils/tests.py @@ -64,7 +64,7 @@ class SendingMail(TestCase): def test_send_mail_preformatted(self): msg = """To: to1@example.com, to2@example.com -From: from1@example.com, from2@example.com +From: from1@ietf.org, from2@ietf.org Cc: cc1@example.com, cc2@example.com Bcc: bcc1@example.com, bcc2@example.com Subject: subject @@ -74,7 +74,7 @@ body send_mail_preformatted(None, msg, {}, {}) recv = outbox[-1] self.assertEqual(recv['To'], ', ') - self.assertEqual(recv['From'], 'from1@example.com, from2@example.com') + self.assertEqual(recv['From'], 'from1@ietf.org, from2@ietf.org') self.assertEqual(recv['Cc'], 'cc1@example.com, cc2@example.com') self.assertEqual(recv['Bcc'], None) self.assertEqual(recv['Subject'], 'subject') @@ -82,14 +82,14 @@ body override = { 'To': 'oto1@example.net, oto2@example.net', - 'From': 'ofrom1@example.net, ofrom2@example.net', + 'From': 'ofrom1@ietf.org, ofrom2@ietf.org', 'Cc': 'occ1@example.net, occ2@example.net', 'Subject': 'osubject', } send_mail_preformatted(request=None, preformatted=msg, extra={}, override=override) recv = outbox[-1] self.assertEqual(recv['To'], ', ') - self.assertEqual(recv['From'], 'ofrom1@example.net, ofrom2@example.net') + self.assertEqual(recv['From'], 'ofrom1@ietf.org, ofrom2@ietf.org') self.assertEqual(recv['Cc'], 'occ1@example.net, occ2@example.net') self.assertEqual(recv['Bcc'], None) self.assertEqual(recv['Subject'], 'osubject') @@ -97,14 +97,14 @@ body override = { 'To': ['', 'oto2@example.net'], - 'From': ['', 'ofrom2@example.net'], + 'From': ['', 'ofrom2@ietf.org'], 'Cc': ['', 'occ2@example.net'], 'Subject': 'osubject', } send_mail_preformatted(request=None, preformatted=msg, extra={}, override=override) recv = outbox[-1] self.assertEqual(recv['To'], ', ') - self.assertEqual(recv['From'], ', ofrom2@example.net') + self.assertEqual(recv['From'], ', ofrom2@ietf.org') self.assertEqual(recv['Cc'], ', occ2@example.net') self.assertEqual(recv['Bcc'], None) self.assertEqual(recv['Subject'], 'osubject')