From 340b6591b23e9e50c30f47c5d13530b8fab59d99 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sat, 9 Jun 2018 22:16:26 +0000 Subject: [PATCH] Use factories for ietf.doc.tests_status_change. Repair previous commit errors in ietf.doc.tests_material. Commit ready for merge. - Legacy-Id: 15238 --- ietf/doc/tests_material.py | 4 ++++ ietf/doc/tests_status_change.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py index 4eb144ab2..687719a5c 100644 --- a/ietf/doc/tests_material.py +++ b/ietf/doc/tests_material.py @@ -12,7 +12,9 @@ from django.conf import settings from django.urls import reverse as urlreverse from ietf.doc.models import Document, State, DocAlias, NewRevisionDocEvent +from ietf.group.factories import RoleFactory from ietf.group.models import Group +from ietf.meeting.factories import MeetingFactory from ietf.meeting.models import Meeting, Session, SessionPresentation from ietf.name.models import SessionStatusName from ietf.person.models import Person @@ -43,6 +45,8 @@ class GroupMaterialTests(TestCase): def create_slides(self): + MeetingFactory(type_id='ietf',number='42') + RoleFactory(name_id='chair',person__user__username='marschairman',group__type_id='wg',group__acronym='mars') group = Group.objects.create(type_id="team", acronym="testteam", name="Test Team", state_id="active") doc = Document.objects.create(name="slides-testteam-test-file", rev="01", type_id="slides", group=group) diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py index 1b80d92dd..937191d6c 100644 --- a/ietf/doc/tests_status_change.py +++ b/ietf/doc/tests_status_change.py @@ -2,6 +2,8 @@ import os import shutil +import debug # pyflakes:ignore + from pyquery import PyQuery from StringIO import StringIO from textwrap import wrap @@ -9,6 +11,7 @@ from textwrap import wrap from django.conf import settings from django.urls import reverse as urlreverse +from ietf.doc.factories import DocumentFactory, IndividualRfcFactory, WgRfcFactory from ietf.doc.models import ( Document, DocAlias, State, DocEvent, BallotPositionDocEvent, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent ) from ietf.doc.utils import create_ballot_if_not_open @@ -17,7 +20,6 @@ from ietf.group.models import Person from ietf.iesg.models import TelechatDate from ietf.utils.test_utils import TestCase, unicontent from ietf.utils.mail import outbox -from ietf.utils.test_data import make_test_data from ietf.utils.test_utils import login_testing_unauthorized @@ -389,8 +391,10 @@ class StatusChangeTests(TestCase): self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Affected RFC list changed.')) def setUp(self): - make_test_data() - + IndividualRfcFactory(alias2__name='rfc14',name='draft-was-never-issued',std_level_id='unkn') + WgRfcFactory(alias2__name='rfc9999',name='draft-ietf-random-thing',std_level_id='ps') + WgRfcFactory(alias2__name='rfc9998',name='draft-ietf-random-other-thing',std_level_id='inf') + DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review',notify='notify@example.org') class StatusChangeSubmitTests(TestCase): def test_initial_submission(self): @@ -478,7 +482,7 @@ class StatusChangeSubmitTests(TestCase): self.assertTrue("This is the old proposal." in unicontent(r)) def setUp(self): - make_test_data() + DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review',notify='notify@example.org') self.test_dir = self.tempdir('status-change') self.saved_status_change_path = settings.STATUS_CHANGE_PATH settings.STATUS_CHANGE_PATH = self.test_dir