diff --git a/tests/base.py b/tests/base.py index c09828b4f..597a74f29 100644 --- a/tests/base.py +++ b/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): diff --git a/tests/panels/test_template.py b/tests/panels/test_template.py index 9ff39543f..f666fc82e 100644 --- a/tests/panels/test_template.py +++ b/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("