From 411b5f4747a65e8e59b7b9c4e48be0ee589b620a Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 16 Jun 2022 19:59:12 +0300 Subject: [PATCH] fix: Fix some HTML validation errors that came in via #4035 (#4066) * fix: Fix some HTML validation errors that came in via #4035 Also make validation errors display a bit better. * content -> color for mask-icon (caught by @jennifer-richards; thanks) --- ietf/templates/base/icons.html | 6 +++--- ietf/templates/doc/htmlized_base.html | 2 +- ietf/utils/test_runner.py | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ietf/templates/base/icons.html b/ietf/templates/base/icons.html index 493edc2cd..59634ec6e 100644 --- a/ietf/templates/base/icons.html +++ b/ietf/templates/base/icons.html @@ -12,8 +12,8 @@ + color="{% if server_mode and server_mode == 'production' %}#ffffff{% else %}#ffc4c4{% endif %}"> + content="{% if server_mode and server_mode == 'production' %}#ffffff{% else %}#ffc4c4{% endif %}"> \ No newline at end of file + content="{% if server_mode and server_mode == 'production' %}#ffffff{% else %}#ffc4c4{% endif %}"> \ No newline at end of file diff --git a/ietf/templates/doc/htmlized_base.html b/ietf/templates/doc/htmlized_base.html index 5f84e6894..e3624c0df 100644 --- a/ietf/templates/doc/htmlized_base.html +++ b/ietf/templates/doc/htmlized_base.html @@ -125,7 +125,7 @@ {% block morecss %}{% endblock %} - {% block pagehead %}{% endblock %}\ + {% block pagehead %}{% endblock %} {% include "base/icons.html" %} diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py index 77c82d2fd..2592216bd 100644 --- a/ietf/utils/test_runner.py +++ b/ietf/utils/test_runner.py @@ -997,10 +997,9 @@ class IetfTestRunner(DiscoverRunner): for msg in json.loads(result)["messages"]: if vnu_filter_message(msg, False, True): continue - errors = vnu_fmt_message(file, msg, content) - - if errors: - testcase.fail(errors) + errors = vnu_fmt_message(file, msg, content.decode("utf-8")) + if errors: + testcase.fail(errors) tmpdir.cleanup()