Show error before showing the XML output.

Ostorlab · Jan 17, 2024 · 1c9934b · 1c9934b
1 parent 7ca958f
commit 1c9934b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/agent/nmap_wrapper.py b/agent/nmap_wrapper.py
@@ -30,9 +30,7 @@ def parse_output(xml_output: str) -> dict[str, Any]:
         return parsed_xml
     except xml.parsers.expat.ExpatError as parsing_error:
         logger.error(
-            "Error parsing XML output: %s - Original Error: %s",
-            xml_output,
-            parsing_error,
+            "Error parsing XML output: %s - XML output: %s", parsing_error, xml_output
         )
         raise
 

diff --git a/tests/nmap_wrapper_test.py b/tests/nmap_wrapper_test.py
@@ -125,7 +125,6 @@ def testNmapWrapper_whenAllTopPortsUsed_returnCommand(
 def testNmapWrapperParseOutput_whenXmlIsInvalid_catchesAndReraisesError() -> None:
     """Tests parsing invalid XML output scan results. Should catch the error and re-raise it."""
     invalid_xml = (pathlib.Path(__file__).parent / "malformed_output.xml").read_text()
-
     parsed_output = None
 
     with pytest.raises(xml.parsers.expat.ExpatError):
@@ -139,7 +138,6 @@ def testNmapWrapperParseOutput_whenXmlIsValid_returnsParsedXml() -> None:
     valid_xml = (
         pathlib.Path(__file__).parent / "fake_output_with_down_host.xml"
     ).read_text()
-
     parsed_output = nmap_wrapper.parse_output(valid_xml)
 
     assert {