Skip to content

Commit ac73bd6

Browse files
levkowetzlevkowetz
committed
Tweaked some test failure messages for better debugging.
 - Legacy-Id: 16290
1 parent 1370597 commit ac73bd6

1 file changed

Lines changed: 29 additions & 29 deletions

File tree

‎ietf/iesg/tests.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,11 @@ def test_agenda_json(self):
314314

315315
for k, d in self.telechat_docs.iteritems():
316316
if d.type_id == "charter":
317-
self.assertTrue(d.group.name in unicontent(r), "%s not in response" % k)
318-
self.assertTrue(d.group.acronym in unicontent(r), "%s acronym not in response" % k)
317+
self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name))
318+
self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym))
319319
else:
320-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
321-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
320+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name))
321+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title))
322322

323323
self.assertTrue(json.loads(r.content))
324324

@@ -328,23 +328,23 @@ def test_agenda(self):
328328

329329
for k, d in self.telechat_docs.iteritems():
330330
if d.type_id == "charter":
331-
self.assertTrue(d.group.name in unicontent(r), "%s not in response" % k)
332-
self.assertTrue(d.group.acronym in unicontent(r), "%s acronym not in response" % k)
331+
self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name))
332+
self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym))
333333
else:
334-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
335-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
334+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name))
335+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title))
336336

337337
def test_agenda_txt(self):
338338
r = self.client.get(urlreverse("ietf.iesg.views.agenda_txt"))
339339
self.assertEqual(r.status_code, 200)
340340

341341
for k, d in self.telechat_docs.iteritems():
342342
if d.type_id == "charter":
343-
self.assertTrue(d.group.name in unicontent(r), "%s not in response" % k)
344-
self.assertTrue(d.group.acronym in unicontent(r), "%s acronym not in response" % k)
343+
self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name))
344+
self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym))
345345
else:
346-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
347-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
346+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name))
347+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title))
348348

349349
def test_agenda_scribe_template(self):
350350
r = self.client.get(urlreverse("ietf.iesg.views.agenda_scribe_template"))
@@ -354,8 +354,8 @@ def test_agenda_scribe_template(self):
354354
if d.type_id == "charter":
355355
continue # scribe template doesn't contain chartering info
356356

357-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
358-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
357+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name))
358+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title))
359359

360360
def test_agenda_moderator_package(self):
361361
url = urlreverse("ietf.iesg.views.agenda_moderator_package")
@@ -365,17 +365,17 @@ def test_agenda_moderator_package(self):
365365

366366
for k, d in self.telechat_docs.iteritems():
367367
if d.type_id == "charter":
368-
self.assertTrue(d.group.name in unicontent(r), "%s not in response" % k)
369-
self.assertTrue(d.group.acronym in unicontent(r), "%s acronym not in response" % k)
368+
self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name))
369+
self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym))
370370
else:
371371
if d.type_id == "draft" and d.name == "draft-ietf-mars-test":
372-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
373-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
374-
self.assertTrue("Has downref: Yes" in unicontent(r), "%s downref not in response" % k)
375-
self.assertTrue("Add rfc6666" in unicontent(r), "%s downref not in response" % k)
372+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name))
373+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title))
374+
self.assertTrue("Has downref: Yes" in unicontent(r), "%s downref not in response" % (k, ))
375+
self.assertTrue("Add rfc6666" in unicontent(r), "%s downref not in response" % (k, ))
376376
else:
377-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
378-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
377+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name))
378+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title))
379379

380380
def test_agenda_package(self):
381381
url = urlreverse("ietf.iesg.views.agenda_package")
@@ -385,28 +385,28 @@ def test_agenda_package(self):
385385

386386
for k, d in self.telechat_docs.iteritems():
387387
if d.type_id == "charter":
388-
self.assertTrue(d.group.name in unicontent(r), "%s not in response" % k)
389-
self.assertTrue(d.group.acronym in unicontent(r), "%s acronym not in response" % k)
388+
self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name, ))
389+
self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym, ))
390390
else:
391-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
392-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
391+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name, ))
392+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title, ))
393393

394394
def test_agenda_documents_txt(self):
395395
url = urlreverse("ietf.iesg.views.agenda_documents_txt")
396396
r = self.client.get(url)
397397
self.assertEqual(r.status_code, 200)
398398

399399
for k, d in self.telechat_docs.iteritems():
400-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
400+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name, ))
401401

402402
def test_agenda_documents(self):
403403
url = urlreverse("ietf.iesg.views.agenda_documents")
404404
r = self.client.get(url)
405405
self.assertEqual(r.status_code, 200)
406406

407407
for k, d in self.telechat_docs.iteritems():
408-
self.assertTrue(d.name in unicontent(r), "%s not in response" % k)
409-
self.assertTrue(d.title in unicontent(r), "%s title not in response" % k)
408+
self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name, ))
409+
self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title, ))
410410

411411
def test_past_documents(self):
412412
url = urlreverse("ietf.iesg.views.past_documents")

0 commit comments

Comments
 (0)