Merged in [15551] from rjsparks@nostrum.com:

    Used factories instead of make_test_data for malinglists, mailtrigger, message, person, secr/announcement, and secr/areas tests.
 - Legacy-Id: 15555
Note: SVN reference [15551] has been migrated to Git commit 5c57cf1

Author: levkowetz

ietf/mailinglists/tests.py

@@ -8,28 +8,24 @@
 
 import debug                            # pyflakes:ignore
 
+from ietf.group.factories import GroupFactory
 from ietf.mailinglists.factories import ListFactory
 from ietf.utils.test_utils import TestCase
-from ietf.utils.test_data import make_test_data
 
 
 class MailingListTests(TestCase):
     def test_groups(self):
-        draft = make_test_data()
-        group = draft.group
         url = urlreverse("ietf.mailinglists.views.groups")
 
         # only those with an archive
-        group.list_archive = ""
-        group.save()
+        group = GroupFactory()
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertEqual(len(q("#content a:contains(\"%s\")" % group.acronym)), 0)
 
         # successful get
-        group.list_archive = "https://example.com/foo"
-        group.save()
+        group = GroupFactory(list_archive = "https://example.com/foo")
         r = self.client.get(url)
         q = PyQuery(r.content)
         self.assertEqual(len(q("#content a:contains(\"%s\")" % group.acronym)), 1)

ietf/mailtrigger/tests.py

@@ -1,13 +1,9 @@
 from django.urls import reverse as urlreverse
 
 from ietf.utils.test_utils import TestCase, unicontent
-from ietf.utils.test_data import make_test_data
 
 class EventMailTests(TestCase):
 
-    def setUp(self):
-        make_test_data()
-
     def test_show_triggers(self):
 
         url = urlreverse('ietf.mailtrigger.views.show_triggers')

ietf/message/tests.py

@@ -3,19 +3,16 @@
 from django.urls import reverse as urlreverse
 
 from ietf.utils.test_utils import TestCase, unicontent
-from ietf.utils.test_data import make_test_data
 from ietf.utils.mail import outbox
 
 from ietf.message.models import Message, SendQueue
 from ietf.person.models import Person
-from ietf.group.models import Group
+from ietf.group.factories import GroupFactory
 from ietf.message.utils import send_scheduled_message_from_send_queue
 
 class MessageTests(TestCase):
     def test_message_view(self):
-        make_test_data()
-
-        nomcom = Group.objects.create(name="nomcom%s" % datetime.date.today().year, type_id="nomcom")
+        nomcom = GroupFactory(name="nomcom%s" % datetime.date.today().year, type_id="nomcom")
         msg = Message.objects.create(
             by=Person.objects.get(name="(System)"),
             subject="This is a test",
@@ -36,8 +33,6 @@ def test_message_view(self):
 
 class SendScheduledAnnouncementsTests(TestCase):
     def test_send_plain_announcement(self):
-        make_test_data()
-
         msg = Message.objects.create(
             by=Person.objects.get(name="(System)"),
             subject="This is a test",
@@ -64,8 +59,6 @@ def test_send_plain_announcement(self):
         self.assertTrue(SendQueue.objects.get(id=q.id).sent_at)
 
     def test_send_mime_announcement(self):
-        make_test_data()
-
         msg = Message.objects.create(
             by=Person.objects.get(name="(System)"),
             subject="This is a test",

ietf/person/tests.py

@@ -10,15 +10,14 @@
 import debug                            # pyflakes:ignore
 
 from ietf.community.models import CommunityList
-from ietf.group.models import Group
+from ietf.group.factories import RoleFactory
 from ietf.nomcom.models import NomCom
 from ietf.nomcom.test_data import nomcom_test_data
 from ietf.nomcom.factories import NomComFactory, NomineeFactory, NominationFactory, FeedbackFactory, PositionFactory
 from ietf.person.factories import EmailFactory, PersonFactory, UserFactory
 from ietf.person.models import Person, Alias
 from ietf.person.utils import (merge_persons, determine_merge_order, send_merge_notification,
     handle_users, get_extra_primary, dedupe_aliases, move_related_objects, merge_nominees, merge_users)
-from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 
@@ -32,8 +31,7 @@ def get_person_no_user():
 
 class PersonTests(TestCase):
     def test_ajax_search_emails(self):
-        draft = make_test_data()
-        person = draft.ad
+        person = PersonFactory()
 
         r = self.client.get(urlreverse("ietf.person.views.ajax_select2_search", kwargs={ "model_name": "email"}), dict(q=person.name))
         self.assertEqual(r.status_code, 200)
@@ -238,12 +236,10 @@ def test_merge_persons(self):
         self.assertFalse(source_user.is_active)
 
     def test_merge_users(self):
-        make_test_data()
-
         person = PersonFactory()
         source = person.user
         target = UserFactory()
-        mars = Group.objects.get(acronym='mars')
+        mars = RoleFactory(name_id='chair',group__acronym='mars').group
         communitylist = CommunityList.objects.create(user=source, group=mars)
         nomcom = NomComFactory()
         position = PositionFactory(nomcom=nomcom)

ietf/secr/announcement/tests.py

@@ -3,13 +3,12 @@
 from pyquery import PyQuery
 
 from ietf.utils.test_utils import TestCase
+from ietf.group.factories import RoleFactory
 from ietf.group.models import Group
 from ietf.message.models import Message
 from ietf.name.models import RoleName
 from ietf.nomcom.test_data import nomcom_test_data
-from ietf.person.models import Person
 from ietf.message.models import AnnouncementFrom
-from ietf.utils.test_data import make_test_data
 from ietf.utils.mail import outbox, empty_outbox
 
 SECR_USER='secretary'
@@ -18,7 +17,6 @@
 
 class SecrAnnouncementTestCase(TestCase):
     def setUp(self):
-        make_test_data()
         chair = RoleName.objects.get(slug='chair')
         secr = RoleName.objects.get(slug='secr')
         ietf = Group.objects.get(acronym='ietf')
@@ -64,17 +62,15 @@ def test_main_announce_from(self):
 class UnauthorizedAnnouncementCase(TestCase):
     def test_unauthorized(self):
         "Unauthorized Test"
-        make_test_data()
         url = reverse('ietf.secr.announcement.views.main')
-        person = Person.objects.filter(role__group__acronym='mars')[0]
+        person = RoleFactory(name_id='chair',group__acronym='mars').person
         self.client.login(username=person.user.username, password=person.user.username+"+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 403)
 
 class SubmitAnnouncementCase(TestCase):
     def test_invalid_submit(self):
         "Invalid Submit"
-        make_test_data()
         url = reverse('ietf.secr.announcement.views.main')
         post_data = {'id_subject':''}
         self.client.login(username="secretary", password="secretary+password")
@@ -85,7 +81,6 @@ def test_invalid_submit(self):
 
     def test_valid_submit(self):
         "Valid Submit"
-        make_test_data()
         nomcom_test_data()
         empty_outbox()
         url = reverse('ietf.secr.announcement.views.main')

ietf/secr/areas/tests.py

@@ -1,9 +1,9 @@
 from django.urls import reverse
 
+from ietf.group.factories import GroupFactory, GroupEventFactory
 from ietf.group.models import Group, GroupEvent
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase
-from ietf.utils.test_data import make_test_data
 
 
 SECR_USER='secretary'
@@ -18,25 +18,22 @@ def augment_data():
 class SecrAreasTestCase(TestCase):
     def test_main(self):
         "Main Test"
-        make_test_data()
+        GroupFactory(type_id='area')
         url = reverse('ietf.secr.areas.views.list_areas')
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_view(self):
         "View Test"
-        make_test_data()
-        augment_data()
-        areas = Group.objects.filter(type='area',state='active')
-        url = reverse('ietf.secr.areas.views.view', kwargs={'name':areas[0].acronym})
+        area = GroupEventFactory(type='started',group__type_id='area').group
+        url = reverse('ietf.secr.areas.views.view', kwargs={'name':area.acronym})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_add(self):
         "Add Test"
-        make_test_data()
         url = reverse('ietf.secr.areas.views.add')
         self.client.login(username="secretary", password="secretary+password")
         data = {'acronym':'ta',