Merge pull request #250 from lzaoral/hub-remove-extra-newline-in-logs

hub: do not insert extra newlines to logs on page reloads
release-engineering · Mar 14, 2024 · 88237f2 · 88237f2
2 parents 313d553 + 84a0531
commit 88237f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/kobo/hub/templates/task/log.html b/kobo/hub/templates/task/log.html
@@ -14,8 +14,5 @@
 <h2>{% trans 'Task' %} #{{ task.id }} - {{ log_name }}</h2>
 <a href="{% url 'task/detail' task.id %}">{% trans "back to task" %} #{{ task.id }}</a><br />
 <a href="?format=raw">{% trans 'download' %}</a>
-<pre class="log" id="log">
-{{ content }}
-</pre>
-
+<pre class="log" id="log">{{ content }}</pre>
 {% endblock %}
diff --git a/tests/test_view_log.py b/tests/test_view_log.py
@@ -196,7 +196,7 @@ def test_view_html_wrapped(self):
  # The response is expected to be wrapped in some view.
  # We are only doing a very basic verification of the view here
  self.assertTrue(content.startswith('<!DOCTYPE html'))
- self.assertTrue((small_log_content() + "\n</pre>") in content, content)
+ self.assertTrue((small_log_content() + "</pre>") in content, content)
 
  # No trimming necessary
  self.assertFalse('...trimmed, download required for full log' in content)
@@ -210,7 +210,7 @@ def test_view_tiny_html_wrapped(self):
  )
 
  self.assertTrue(content.startswith('<!DOCTYPE html'))
- self.assertTrue((tiny_log_content() + "\n</pre>") in content, content)
+ self.assertTrue((tiny_log_content() + "</pre>") in content, content)
  self.assertFalse('...trimmed, download required for full log' in content)
 
  @profile