From 81fa6dc9620460f0e5864767a941d01cfa71fcef Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 4 Jul 2019 16:04:39 +0000
Subject: [PATCH] Fixed some issues with bulk changes related to
assertContains() - Legacy-Id: 16379
---
ietf/doc/tests_downref.py | 26 ++++++++---------
ietf/doc/tests_review.py | 8 +++---
ietf/iesg/tests.py | 59 +++++++++++++++++++--------------------
ietf/ipr/tests.py | 4 +--
4 files changed, 48 insertions(+), 49 deletions(-)
diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py
index d7f617256..bf5dcfa7b 100644
--- a/ietf/doc/tests_downref.py
+++ b/ietf/doc/tests_downref.py
@@ -12,7 +12,7 @@ from ietf.doc.factories import WgDraftFactory, WgRfcFactory
from ietf.doc.models import RelatedDocument, State
from ietf.person.factories import PersonFactory
from ietf.utils.test_utils import TestCase
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized
class Downref(TestCase):
@@ -39,13 +39,13 @@ class Downref(TestCase):
self.client.login(username='secretary', password='secretary+password')
r = self.client.get(url)
self.assertContains(r, '<h1>Downref registry</h1>')
- self.assertContains(r, ('Add downref')
+ self.assertContains(r, 'Add downref')
# area director - get the table with the "Add downref" button
self.client.login(username='ad', password='ad+password')
r = self.client.get(url)
- self.assertContains(r, ('<h1>Downref registry</h1>')
- self.assertContains(r, ('Add downref')
+ self.assertContains(r, '<h1>Downref registry</h1>')
+ self.assertContains(r, 'Add downref')
def test_downref_registry_add(self):
url = urlreverse('ietf.doc.views_downref.downref_registry_add')
@@ -54,32 +54,32 @@ class Downref(TestCase):
# secretariat - get the form to add entries to the registry
self.client.login(username='secretary', password='secretary+password')
r = self.client.get(url)
- self.assertContains(r, ('<h1>Add entry to the downref registry</h1>')
- self.assertContains(r, ('Save downref')
+ self.assertContains(r, '<h1>Add entry to the downref registry</h1>')
+ self.assertContains(r, 'Save downref')
# area director - get the form to add entries to the registry
self.client.login(username='ad', password='ad+password')
r = self.client.get(url)
- self.assertContains(r, ('<h1>Add entry to the downref registry</h1>')
- self.assertContains(r, ('Save downref')
+ self.assertContains(r, '<h1>Add entry to the downref registry</h1>')
+ self.assertContains(r, 'Save downref')
# error - already in the downref registry
r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.doc.pk, )))
- self.assertContains(r, ('Downref is already in the registry')
+ self.assertContains(r, 'Downref is already in the registry')
# error - source is not in an approved state
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
- self.assertContains(r, ('Draft is not yet approved')
+ self.assertContains(r, 'Draft is not yet approved')
# error - the target is not a normative reference of the source
self.draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub"))
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
- self.assertContains(r, ('There does not seem to be a normative reference to RFC')
- self.assertContains(r, ('Save downref anyway')
+ self.assertContains(r, 'There does not seem to be a normative reference to RFC')
+ self.assertContains(r, 'Save downref anyway')
# normal - approve the document so the downref is now okay
RelatedDocument.objects.create(source=self.draft, target=self.rfcalias, relationship_id='refnorm')
@@ -92,7 +92,7 @@ class Downref(TestCase):
self.assertEqual(r.status_code, 302)
newurl = urlreverse('ietf.doc.views_downref.downref_registry')
r = self.client.get(newurl)
- self.assertContains(r, ('<a href="/doc/draft-ietf-mars-test')
+ self.assertContains(r, '<a href="/doc/draft-ietf-mars-test')
self.assertTrue(RelatedDocument.objects.filter(source=self.draft, target=self.rfcalias, relationship_id='downref-approval'))
self.assertEqual(self.draft.docevent_set.count(), draft_de_count_before + 1)
self.assertEqual(self.rfc.docevent_set.count(), rfc_de_count_before + 1)
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index 06973cb76..ca23a6a88 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -1,7 +1,7 @@
# Copyright The IETF Trust 2016-2019, All Rights Reserved
# -*- coding: utf-8 -*-
-import datetime, os, shutil, json
+import datetime, os, shutil
import tarfile, tempfile, mailbox
import email.mime.multipart, email.mime.text, email.utils
@@ -33,7 +33,7 @@ from ietf.review.utils import reviewer_rotation_list, possibly_advance_next_revi
from ietf.utils.test_utils import TestCase
from ietf.utils.test_data import create_person
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent, reload_db_objects
+from ietf.utils.test_utils import login_testing_unauthorized, reload_db_objects
from ietf.utils.mail import outbox, empty_outbox, parseaddr, on_behalf_of
from ietf.person.factories import PersonFactory
@@ -152,7 +152,7 @@ class ReviewTests(TestCase):
url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": doc.name })
r = self.client.get(url)
- self.assertContains(r, ("{} Review".format(review_req.type.name))
+ self.assertContains(r, "{} Review".format(review_req.type.name))
def test_review_request(self):
doc = WgDraftFactory(group__acronym='mars',rev='01')
@@ -748,7 +748,7 @@ class ReviewTests(TestCase):
# Mock up the url response for the request.get() call to retrieve the mailing list url
response = Response()
response.status_code = 200
- response._content = "This is a review\nwith two lines"
+ response._content = b"This is a review\nwith two lines"
mock.return_value = response
# Run the test
diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py
index 98ca4e272..c18a35687 100644
--- a/ietf/iesg/tests.py
+++ b/ietf/iesg/tests.py
@@ -3,7 +3,6 @@
import os
import shutil
-import json
import datetime
from pyquery import PyQuery
@@ -315,11 +314,11 @@ class IESGAgendaTests(TestCase):
for k, d in self.telechat_docs.items():
if d.type_id == "charter":
- self.assertContains(r, d.group.name, "%s '%s' not in response" % (k, d.group.name))
- self.assertContains(r, d.group.acronym, "%s '%s' acronym not in response" % (k, d.group.acronym))
+ self.assertContains(r, d.group.name, msg_prefix="%s '%s' not in response" % (k, d.group.name))
+ self.assertContains(r, d.group.acronym, msg_prefix="%s '%s' acronym not in response" % (k, d.group.acronym))
else:
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title))
self.assertTrue(r.json())
@@ -329,11 +328,11 @@ class IESGAgendaTests(TestCase):
for k, d in self.telechat_docs.items():
if d.type_id == "charter":
- self.assertContains(r, d.group.name, "%s '%s' not in response" % (k, d.group.name))
- self.assertContains(r, d.group.acronym, "%s '%s' acronym not in response" % (k, d.group.acronym))
+ self.assertContains(r, d.group.name, msg_prefix="%s '%s' not in response" % (k, d.group.name))
+ self.assertContains(r, d.group.acronym, msg_prefix="%s '%s' acronym not in response" % (k, d.group.acronym))
else:
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title))
def test_agenda_txt(self):
r = self.client.get(urlreverse("ietf.iesg.views.agenda_txt"))
@@ -341,11 +340,11 @@ class IESGAgendaTests(TestCase):
for k, d in self.telechat_docs.items():
if d.type_id == "charter":
- self.assertContains(r, d.group.name, "%s '%s' not in response" % (k, d.group.name))
- self.assertContains(r, d.group.acronym, "%s '%s' acronym not in response" % (k, d.group.acronym))
+ self.assertContains(r, d.group.name, msg_prefix="%s '%s' not in response" % (k, d.group.name))
+ self.assertContains(r, d.group.acronym, msg_prefix="%s '%s' acronym not in response" % (k, d.group.acronym))
else:
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title))
def test_agenda_scribe_template(self):
r = self.client.get(urlreverse("ietf.iesg.views.agenda_scribe_template"))
@@ -355,8 +354,8 @@ class IESGAgendaTests(TestCase):
if d.type_id == "charter":
continue # scribe template doesn't contain chartering info
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title))
def test_agenda_moderator_package(self):
url = urlreverse("ietf.iesg.views.agenda_moderator_package")
@@ -366,17 +365,17 @@ class IESGAgendaTests(TestCase):
for k, d in self.telechat_docs.items():
if d.type_id == "charter":
- self.assertContains(r, d.group.name, "%s '%s' not in response" % (k, d.group.name))
- self.assertContains(r, d.group.acronym, "%s '%s' acronym not in response" % (k, d.group.acronym))
+ self.assertContains(r, d.group.name, msg_prefix="%s '%s' not in response" % (k, d.group.name))
+ self.assertContains(r, d.group.acronym, msg_prefix="%s '%s' acronym not in response" % (k, d.group.acronym))
else:
if d.type_id == "draft" and d.name == "draft-ietf-mars-test":
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title))
- self.assertContains(r, "Has downref: Yes", "%s downref not in response" % (k, ))
- self.assertContains(r, "Add rfc6666", "%s downref not in response" % (k, ))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title))
+ self.assertContains(r, "Has downref: Yes", msg_prefix="%s downref not in response" % (k, ))
+ self.assertContains(r, "Add rfc6666", msg_prefix="%s downref not in response" % (k, ))
else:
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title))
def test_agenda_package(self):
url = urlreverse("ietf.iesg.views.agenda_package")
@@ -386,11 +385,11 @@ class IESGAgendaTests(TestCase):
for k, d in self.telechat_docs.items():
if d.type_id == "charter":
- self.assertContains(r, d.group.name, "%s '%s' not in response" % (k, d.group.name, ))
- self.assertContains(r, d.group.acronym, "%s '%s' acronym not in response" % (k, d.group.acronym, ))
+ self.assertContains(r, d.group.name, msg_prefix="%s '%s' not in response" % (k, d.group.name, ))
+ self.assertContains(r, d.group.acronym, msg_prefix="%s '%s' acronym not in response" % (k, d.group.acronym, ))
else:
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name, ))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title, ))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name, ))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title, ))
def test_agenda_documents_txt(self):
url = urlreverse("ietf.iesg.views.agenda_documents_txt")
@@ -398,7 +397,7 @@ class IESGAgendaTests(TestCase):
self.assertEqual(r.status_code, 200)
for k, d in self.telechat_docs.items():
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name, ))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name, ))
def test_agenda_documents(self):
url = urlreverse("ietf.iesg.views.agenda_documents")
@@ -406,8 +405,8 @@ class IESGAgendaTests(TestCase):
self.assertEqual(r.status_code, 200)
for k, d in self.telechat_docs.items():
- self.assertContains(r, d.name, "%s '%s' not in response" % (k, d.name, ))
- self.assertContains(r, d.title, "%s '%s' title not in response" % (k, d.title, ))
+ self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name, ))
+ self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title, ))
def test_past_documents(self):
url = urlreverse("ietf.iesg.views.past_documents")
diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
index ae787eb7a..b309a4e73 100644
--- a/ietf/ipr/tests.py
+++ b/ietf/ipr/tests.py
@@ -21,7 +21,7 @@ from ietf.ipr.utils import get_genitive, get_ipr_summary
from ietf.mailtrigger.utils import gather_address_lists
from ietf.message.models import Message
from ietf.utils.mail import outbox, empty_outbox
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
from ietf.utils.text import text_to_dict
@@ -158,7 +158,7 @@ class IprTests(TestCase):
r = self.client.get(url + "?submit=draft&draft=draft")
self.assertEqual(r.status_code, 200)
self.assertContains(r, draft.name)
- self.assertContains(r, ipr.title not)
+ self.assertContains(r, ipr.title)
DocAlias.objects.create(name="rfc321").docs.add(draft)