From 255a207cfe6eae1dbbf0d3c44653bd540ddc45f4 Mon Sep 17 00:00:00 2001
From: Pelle Koster <pelle.koster@geant.org>
Date: Wed, 10 Apr 2024 12:35:23 +0200
Subject: [PATCH] fix flake8
---
.../data/test_render_html-expected.html | 23 ++++++++
..._render_html_with_exclusions-expected.html | 18 +++++++
test/error_report/test_error_report.py | 54 +++----------------
3 files changed, 49 insertions(+), 46 deletions(-)
create mode 100644 test/error_report/data/test_render_html-expected.html
create mode 100644 test/error_report/data/test_render_html_with_exclusions-expected.html
diff --git a/test/error_report/data/test_render_html-expected.html b/test/error_report/data/test_render_html-expected.html
new file mode 100644
index 0000000..3c6cded
--- /dev/null
+++ b/test/error_report/data/test_render_html-expected.html
@@ -0,0 +1,23 @@
+<html>
+<body>
+<pre>
+=================================
+mx1.ams.nl.geant.net
+=================================
+ ae1 PHY blah blah
+ framing-errors 4 Diff: 2
+ input-drops 2 Diff: 1
+
+=================================
+mx1.fra.de.geant.net
+=================================
+ ae10 PHY blah blah foo
+ input-drops 3
+
+
+
+
+Generated <some date>
+</pre>
+</body>
+</html>
\ No newline at end of file
diff --git a/test/error_report/data/test_render_html_with_exclusions-expected.html b/test/error_report/data/test_render_html_with_exclusions-expected.html
new file mode 100644
index 0000000..bcd4e35
--- /dev/null
+++ b/test/error_report/data/test_render_html_with_exclusions-expected.html
@@ -0,0 +1,18 @@
+<html>
+<body>
+<pre>
+=================================
+mx1.ams.nl.geant.net
+=================================
+ ae1 PHY blah blah
+ input-drops 2
+
+ROUTER,INTERFACE,FRAMING ERRORS,BIT ERROR SECONDS,ERRORED BLOCKS SECONDS,CRC ERRORS,TOTAL ERRORS,INPUT DISCARDS,INPUT DROPS,OUTPUT DROPS
+mx1.fra.de.geant.net,ae10,1,2,3,4,5,6,7,8,PHY blah blah foo
+
+
+
+Generated <some date>
+</pre>
+</body>
+</html>
\ No newline at end of file
diff --git a/test/error_report/test_error_report.py b/test/error_report/test_error_report.py
index f867092..f28fd00 100644
--- a/test/error_report/test_error_report.py
+++ b/test/error_report/test_error_report.py
@@ -161,6 +161,7 @@ def test_validate_config(tmp_path):
"hostname": "some.smtp.server",
"username": "smtp-user",
"password": "smtp-password",
+ "starttls": False,
},
"inventory": ["blah"],
"influx": {
@@ -425,32 +426,9 @@ def test_render_html(create_error_point, get_interface_errors):
create_error_point("mx1.fra.de.geant.net", "ae10", "today", input_drops=3)
errors = get_interface_errors()
result = render_html(errors=errors, date="<some date>")
- # be careful, there are tabs mixed with spaces here, but hey, we want to keep the
- # output as close to the original script
- expected = """\
-<html>
-<body>
-<pre>
-=================================
-mx1.ams.nl.geant.net
-=================================
- ae1 PHY blah blah
- framing-errors 4 Diff: 2
- input-drops 2 Diff: 1
-
-=================================
-mx1.fra.de.geant.net
-=================================
- ae10 PHY blah blah foo
- input-drops 3
-
-
-
-
-Generated <some date>
-</pre>
-</body>
-</html>"""
+ # The expected value contains mixed tabs and spaces. We put it in a separate file
+ # to comply with flake8
+ expected = (DATA_DIR / "test_render_html-expected.html").read_text()
assert result == expected.replace("\n", "\r\n")
@@ -473,26 +451,10 @@ def test_render_html_with_exclusions(create_error_point, get_interface_errors):
)
errors = get_interface_errors(exclusions=["foo"])
result = render_html(errors=errors, date="<some date>")
- # be careful, mixing tabs with spaces here
- expected = """\
-<html>
-<body>
-<pre>
-=================================
-mx1.ams.nl.geant.net
-=================================
- ae1 PHY blah blah
- input-drops 2
-
-ROUTER,INTERFACE,FRAMING ERRORS,BIT ERROR SECONDS,ERRORED BLOCKS SECONDS,CRC ERRORS,TOTAL ERRORS,INPUT DISCARDS,INPUT DROPS,OUTPUT DROPS
-mx1.fra.de.geant.net,ae10,1,2,3,4,5,6,7,8,PHY blah blah foo
-
-
-
-Generated <some date>
-</pre>
-</body>
-</html>"""
+ # The expected value contains mixed tabs and spaces. We put it in a separate file
+ # to comply with flake8
+ expected = (DATA_DIR / "test_render_html_with_exclusions-expected.html").read_text()
+
assert result == expected.replace("\n", "\r\n")
--
GitLab