Fix and improve .assertValidHTML() test method (#1597)

* Make .assertValidHTML() parse passed content

Prior to this commit, the BaseTestCase.assertValidHTML() method was not
parsing the content from the provided argument, but was instead parsing
self.panel.content.  For most usages, the passed in content was the same
as self.panel.content, but for the
TemplatesPanelTestCase.test_template_repr() test case it was not,
resulting in an invalid test.

* Fix test failure exposed by previous commit

* Remove unused .assertValidHTML() msg argument

Allows removal of a call to the internal TestCase._formatMessage()
method.

* Tweak .assertValidHTML() exception message

Since the passed in HTML does not necessarily represent the panel
content, change the message to no longer reference "Content".

Author: living180

tests/base.py

@@ -31,18 +31,16 @@ def tearDown(self):
     def get_response(self, request):
         return self._get_response(request)
 
-    def assertValidHTML(self, content, msg=None):
+    def assertValidHTML(self, content):
         parser = html5lib.HTMLParser()
-        parser.parseFragment(self.panel.content)
+        parser.parseFragment(content)
         if parser.errors:
-            default_msg = ["Content is invalid HTML:"]
+            msg_parts = ["Invalid HTML:"]
             lines = content.split("\n")
             for position, errorcode, datavars in parser.errors:
-                default_msg.append("  %s" % html5lib.constants.E[errorcode] % datavars)
-                default_msg.append("    %s" % lines[position[0] - 1])
-
-            msg = self._formatMessage(msg, "\n".join(default_msg))
-            raise self.failureException(msg)
+                msg_parts.append("  %s" % html5lib.constants.E[errorcode] % datavars)
+                msg_parts.append("    %s" % lines[position[0] - 1])
+            raise self.failureException("\n".join(msg_parts))
 
 
 class IntegrationTestCase(TestCase):

tests/panels/test_template.py

@@ -47,7 +47,7 @@ def test_template_repr(self):
 
         User.objects.create(username="admin")
         bad_repr = TemplateReprForm()
-        t = Template("{{ bad_repr }}")
+        t = Template("<table>{{ bad_repr }}</table>")
         c = Context({"bad_repr": bad_repr})
         html = t.render(c)
         self.assertIsNotNone(html)