Simplify make_test_data a bit by using the create_person helper for the chair and WG delegate, regularize the naming of those

 - Legacy-Id: 6990

Author: OleLaursen

ietf/doc/tests_draft.py

@@ -477,7 +477,7 @@ def test_warn_expirable_drafts(self):
 
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("aread@ietf.org" in str(outbox[-1])) # author
-        self.assertTrue("wgchairman@ietf.org" in str(outbox[-1]))
+        self.assertTrue("marschairman@ietf.org" in str(outbox[-1]))
 
     def test_expire_drafts(self):
         from ietf.doc.expire import get_expired_drafts, send_expire_notice_for_draft, expire_draft
@@ -1002,8 +1002,8 @@ def test_adopt_document(self):
         self.assertEqual(draft.docevent_set.count() - events_before, 4)
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("adopted" in outbox[-1]["Subject"].lower())
-        self.assertTrue("wgchairman@ietf.org" in unicode(outbox[-1]))
-        self.assertTrue("wgdelegate@ietf.org" in unicode(outbox[-1]))
+        self.assertTrue("marschairman@ietf.org" in unicode(outbox[-1]))
+        self.assertTrue("marsdelegate@ietf.org" in unicode(outbox[-1]))
 
 class ChangeStreamStateTests(TestCase):
     def test_set_tags(self):
@@ -1042,8 +1042,8 @@ def test_set_tags(self):
         self.assertEqual(draft.docevent_set.count() - events_before, 2)
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("tags changed" in outbox[-1]["Subject"].lower())
-        self.assertTrue("wgchairman@ietf.org" in unicode(outbox[-1]))
-        self.assertTrue("wgdelegate@ietf.org" in unicode(outbox[-1]))
+        self.assertTrue("marschairman@ietf.org" in unicode(outbox[-1]))
+        self.assertTrue("marsdelegate@ietf.org" in unicode(outbox[-1]))
         self.assertTrue("plain@example.com" in unicode(outbox[-1]))
 
     def test_set_state(self):
@@ -1086,6 +1086,6 @@ def test_set_state(self):
         self.assertTrue(due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1))
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("state changed" in outbox[-1]["Subject"].lower())
-        self.assertTrue("wgchairman@ietf.org" in unicode(outbox[-1]))
-        self.assertTrue("wgdelegate@ietf.org" in unicode(outbox[-1]))
+        self.assertTrue("marschairman@ietf.org" in unicode(outbox[-1]))
+        self.assertTrue("marsdelegate@ietf.org" in unicode(outbox[-1]))
 

ietf/utils/test_data.py

@@ -163,51 +163,17 @@ def make_test_data():
     group.save()
 
     # plain IETF'er
-    u, created = User.objects.get_or_create(username="plain")
-    plainman, created = Person.objects.get_or_create(
-        name="Plain Man",
-        ascii="Plain Man",
-        user=u)
-    email, created = Email.objects.get_or_create(
-        address="plain@example.com",
-        person=plainman)
+    u = User.objects.create(username="plain")
+    plainman = Person.objects.create(name="Plain Man", ascii="Plain Man", user=u)
+    email = Email.objects.create(address="plain@example.com", person=plainman)
+
+    # group personnel
+    create_person(mars_wg, "chair", name="WG Chair Man", username="marschairman")
+    create_person(mars_wg, "delegate", name="WG Delegate", username="marsdelegate")
 
     mars_wg.ad = ad
     mars_wg.save()
 
-    # group chair
-    u = User.objects.create(username="marschairman")
-    p = Person.objects.create(
-        name="WG Chair Man",
-        ascii="WG Chair Man",
-        user=u
-        )
-    wgchair = Email.objects.create(
-        address="wgchairman@ietf.org",
-        person=p)
-    Role.objects.create(
-        name_id="chair",
-        group=mars_wg,
-        person=p,
-        email=wgchair,
-        )
-
-    # group delegate
-    u = User.objects.create(username="wgdelegate")
-    p = Person.objects.create(
-        name="WG Delegate",
-        ascii="WG Delegate",
-        user=u
-        )
-    email = Email.objects.create(
-        address="wgdelegate@ietf.org",
-        person=p)
-    Role.objects.create(
-        name_id="delegate",
-        group=mars_wg,
-        person=p,
-        email=email,
-        )
 
     # draft
     draft = Document.objects.create(