altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Firmed up the handling of non-ascii names for a test email templat, tweaked some asserts, and removed unused imports.

Browse source 
- Legacy-Id: 16392
This commit is contained in:
Henrik Levkowetz 2019-07-04 20:53:05 +00:00
parent 41438e5c4d
commit 864fc1a814
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/sync/tests.py
View file

@ -5,6 +5,7 @@ import os
import json import json
import datetime import datetime
import io import io
import quopri
import shutil import shutil
from django.conf import settings from django.conf import settings
@ -17,7 +18,7 @@ from ietf.group.factories import GroupFactory
from ietf.person.models import Person from ietf.person.models import Person
from ietf.sync import iana, rfceditor from ietf.sync import iana, rfceditor
from ietf.utils.mail import outbox, empty_outbox from ietf.utils.mail import outbox, empty_outbox
from ietf.utils.test_utils import login_testing_unauthorized, unicontent from ietf.utils.test_utils import login_testing_unauthorized
from ietf.utils.test_utils import TestCase from ietf.utils.test_utils import TestCase
@ -137,8 +138,10 @@ class IANASyncTests(TestCase):
draft = WgDraftFactory() draft = WgDraftFactory()
subject_template = 'Subject: [IANA #12345] Last Call: <%(draft)s-%(rev)s.txt> (Long text) to Informational RFC' subject_template = 'Subject: [IANA #12345] Last Call: <%(draft)s-%(rev)s.txt> (Long text) to Informational RFC'
msg_template = """From: "%(person)s via RT" <drafts-lastcall@iana.org> msg_template = """From: %(fromaddr)s
Date: Thu, 10 May 2012 12:00:0%(rtime)d +0000 Date: Thu, 10 May 2012 12:00:0%(rtime)d +0000
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf-8
%(subject)s %(subject)s
(BEGIN IANA %(tag)s%(embedded_name)s) (BEGIN IANA %(tag)s%(embedded_name)s)
@ -172,7 +175,10 @@ ICANN
if embedded_name or not 'Vacuous' in subject: if embedded_name or not 'Vacuous' in subject:
rtime = 7*subjects.index(subject) + 5*tags.index(tag) + embedded_names.index(embedded_name) rtime = 7*subjects.index(subject) + 5*tags.index(tag) + embedded_names.index(embedded_name)
msg = msg_template % dict(person=Person.objects.get(user__username="iana").name, person=Person.objects.get(user__username="iana")
fromaddr = person.email().formatted_email()
msg = msg_template % dict(person=quopri.encodestring(person.name.encode()),
fromaddr=fromaddr,
draft=draft.name, draft=draft.name,
rev=draft.rev, rev=draft.rev,
tag=tag, tag=tag,
@ -185,7 +191,7 @@ ICANN
self.assertEqual(doc_name, draft.name) self.assertEqual(doc_name, draft.name)
self.assertEqual(review_time, datetime.datetime(2012, 5, 10, 5, 0, rtime)) self.assertEqual(review_time, datetime.datetime(2012, 5, 10, 5, 0, rtime))
self.assertEqual(by, Person.objects.get(user__username="iana")) self.assertEqual(by, Person.objects.get(user__username="iana"))
self.assertTrue("there are no IANA Actions" in comment.replace("\n", "")) self.assertIn("there are no IANA Actions", comment.replace("\n", ""))
events_before = DocEvent.objects.filter(doc=draft, type="iana_review").count() events_before = DocEvent.objects.filter(doc=draft, type="iana_review").count()
iana.add_review_comment(doc_name, review_time, by, comment) iana.add_review_comment(doc_name, review_time, by, comment)