Fixed some unintentional wg list address changes, and added some other test mail address changes.

- Legacy-Id: 15994
This commit is contained in:
Henrik Levkowetz 2019-03-04 20:54:38 +00:00
parent 7c0616e6e1
commit 55bd2e5e42
3 changed files with 11 additions and 11 deletions

View file

@ -68,7 +68,7 @@ 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@example.org',parent=area)
ames = GroupFactory(acronym='ames',state_id='proposed',list_email='ames-wg@ietf.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@example.org')
RoleFactory(name_id='secr',group=ames,person__name=u'Secretary',person__user__email='amessecretary@example.org')
@ -133,7 +133,7 @@ class EditCharterTests(TestCase):
for word in ["Chairs", "Ames Man <ameschairman@example.org>",
"Secretaries", "Secretary <amessecretary@example.org>",
"Assigned Area Director", "Areað Irector <aread@example.org>",
"Mailing list", "ames-wg@example.org",
"Mailing list", "ames-wg@ietf.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@example.org',parent=area)
group = GroupFactory(acronym='ames',state_id='proposed',list_email='ames-wg@ietf.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@example.org')
group = GroupFactory(type_id='wg',acronym='mars',list_email='mars-wg@ietf.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@example.org')
charter = CharterFactory(group__parent=area,group__list_email='mars-wg@ietf.org')
group = charter.group
url = urlreverse('ietf.doc.views_charter.review_announcement_text', kwargs=dict(name=charter.name))
@ -589,7 +589,7 @@ 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@example.org',group__parent=area,group__state_id='bof')
charter = CharterFactory(group__acronym='ames',group__list_email='ames-wg@ietf.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@example.org')
RoleFactory(name_id='secr',group=group,person__name=u'Secretary',person__user__email='amessecretary@example.org')
@ -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@example.org" in outbox[1]['Cc'])
self.assertTrue("ames-wg@ietf.org" in outbox[1]['Cc'])
body = outbox[1].get_payload()
for word in ["Chairs", "Ames Man <ameschairman@example.org>",
"Secretaries", "Secretary <amessecretary@example.org>",
"Assigned Area Director", "Areað Irector <aread@example.org>",
"Area Directors", "Mailing list", "ames-wg@example.org",
"Area Directors", "Mailing list", "ames-wg@ietf.org",
"Charter", "/doc/charter-ietf-ames/", "Milestones"]:
self.assertIn(word, body)

View file

@ -1352,7 +1352,7 @@ class AdoptDraftTests(TestCase):
class ChangeStreamStateTests(TestCase):
def test_set_tags(self):
role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name=u'WG Cháir Man')
RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@ietf.org')
RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@example.org')
draft = WgDraftFactory(group=role.group,shepherd=PersonFactory(user__username='plain',user__email='plain@example.com').email_set.first())
draft.tags.set(DocTagName.objects.filter(slug="w-expert"))
draft.group.unused_tags.add("w-refdoc")

View file

@ -24,7 +24,7 @@ class SecrAnnouncementTestCase(TestCase):
secretariat = Group.objects.get(acronym='secretariat')
AnnouncementFrom.objects.create(name=secr,group=secretariat,address='IETF Secretariat <ietf-secretariat@ietf.org>')
AnnouncementFrom.objects.create(name=chair,group=ietf,address='IETF Chair <chair@ietf.org>')
AnnouncementFrom.objects.create(name=chair,group=iab,address='IAB Chair <iab-chair@ietf.org>')
AnnouncementFrom.objects.create(name=chair,group=iab,address='IAB Chair <iab-chair@iab.org>')
def test_main(self):
"Main Test"
@ -49,7 +49,7 @@ class SecrAnnouncementTestCase(TestCase):
self.assertEqual(r.status_code, 200)
q = PyQuery(r.content)
self.assertEqual(len(q('#id_frm option')),1)
self.assertTrue('<iab-chair@ietf.org>' in q('#id_frm option').val())
self.assertTrue('<iab-chair@iab.org>' in q('#id_frm option').val())
# IETF Chair
self.client.login(username="ietf-chair", password="ietf-chair+password")