fix: address feedback

joseph-sentry · joseph-sentry · commit d3a450963630 · 2025-01-08T11:24:30.000-05:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,4 +21,5 @@ dev-dependencies = [
     "pytest-cov>=6.0.0",
     "pytest-reportlog>=0.4.0",
     "maturin>=1.7.4",
+    "pytest-insta>=0.3.0",
 ]
diff --git a/src/junit.rs b/src/junit.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context};
+use anyhow::Context;
 use pyo3::prelude::*;
 use std::collections::HashSet;
 
@@ -148,13 +148,13 @@ pub fn use_reader(
                 b"skipped" => {
                     let testrun = saved_testrun
                         .as_mut()
-                        .ok_or_else(|| anyhow!("Error accessing saved testrun"))?;
+                        .context("Error accessing saved testrun")?;
                     testrun.outcome = Outcome::Skip;
                 }
                 b"error" => {
                     let testrun = saved_testrun
                         .as_mut()
-                        .ok_or_else(|| anyhow!("Error accessing saved testrun"))?;
+                        .context("Error accessing saved testrun")?;
                     testrun.outcome = Outcome::Error;
 
                     testrun.failure_message = get_attribute(&e, "message")?
@@ -165,7 +165,7 @@ pub fn use_reader(
                 b"failure" => {
                     let testrun = saved_testrun
                         .as_mut()
-                        .ok_or_else(|| anyhow!("Error accessing saved testrun"))?;
+                        .context("Error accessing saved testrun")?;
                     testrun.outcome = Outcome::Failure;
 
                     testrun.failure_message = get_attribute(&e, "message")?
@@ -185,11 +185,9 @@ pub fn use_reader(
             },
             Event::End(e) => match e.name().as_ref() {
                 b"testcase" => {
-                    let testrun = saved_testrun.take().ok_or_else(|| {
-                        anyhow!(
-                            "Met testcase closing tag without first meeting testcase opening tag",
-                        )
-                    })?;
+                    let testrun = saved_testrun.take().context(
+                        "Met testcase closing tag without first meeting testcase opening tag",
+                    )?;
                     testruns.push(testrun);
                 }
                 b"failure" => in_failure = false,
@@ -220,7 +218,7 @@ pub fn use_reader(
                 b"failure" => {
                     let testrun = saved_testrun
                         .as_mut()
-                        .ok_or_else(|| anyhow!("Error accessing saved testrun"))?;
+                        .context("Error accessing saved testrun")?;
                     testrun.outcome = Outcome::Failure;
 
                     testrun.failure_message = get_attribute(&e, "message")?
@@ -229,13 +227,13 @@ pub fn use_reader(
                 b"skipped" => {
                     let testrun = saved_testrun
                         .as_mut()
-                        .ok_or_else(|| anyhow!("Error accessing saved testrun"))?;
+                        .context("Error accessing saved testrun")?;
                     testrun.outcome = Outcome::Skip;
                 }
                 b"error" => {
                     let testrun = saved_testrun
                         .as_mut()
-                        .ok_or_else(|| anyhow!("Error accessing saved testrun"))?;
+                        .context("Error accessing saved testrun")?;
                     testrun.outcome = Outcome::Error;
 
                     testrun.failure_message = get_attribute(&e, "message")?
@@ -247,7 +245,7 @@ pub fn use_reader(
                 if in_failure || in_error {
                     let testrun = saved_testrun
                         .as_mut()
-                        .ok_or_else(|| anyhow!("Error accessing saved testrun"))?;
+                        .context("Error accessing saved testrun")?;
 
                     xml_failure_message.inplace_trim_end();
                     xml_failure_message.inplace_trim_start();
diff --git a/src/raw_upload.rs b/src/raw_upload.rs
@@ -113,9 +113,10 @@ mod tests {
         let base64_data = BASE64_STANDARD.encode(compressed);
         let upload_json = format!(
             r#"{{"network": [], "test_results_files": [{{"filename": "{}", "format": "base64+compressed", "data": "{}"}}]}}"#,
-            filename, base64_data,
+            filename.split('/').last().unwrap(),
+            base64_data,
         );
-        upload_json.as_bytes().to_vec()
+        upload_json.into()
     }
 
     #[test]
diff --git a/src/snapshots/test_results_parser__raw_upload__tests__parse_raw_upload_success@error.xml.snap b/src/snapshots/test_results_parser__raw_upload__tests__parse_raw_upload_success@error.xml.snap
@@ -3,4 +3,4 @@ source: src/raw_upload.rs
 expression: e.to_string()
 input_file: tests/error.xml
 ---
-"Error parsing JUnit XML in /Users/josephsawaya/dev/codecov/test-results-parser/tests/error.xml at 8:24"
+"Error parsing JUnit XML in error.xml at 8:24"
diff --git a/tests/snapshots/parse_raw_upload__TestParsers__junit__0.bin b/tests/snapshots/parse_raw_upload__TestParsers__junit__0.bin
@@ -0,0 +1,18 @@
+# path=junit.xml
+<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="1" skipped="0" tests="2" time="0.186" timestamp="2023-11-10T12:32:56.675324" hostname="VFHNWJDWH9.local"><testcase classname="tests.test_parsers.TestParsers" name="test_junit[junit.xml--True]" time="0.001"><failure message="AssertionError: assert [{'duration': '0.010', 'name': 'tests.test_parsers.TestParsers.test_junit[junit.xml-]', 'outcome': 'failure'}, {'duration': '0.063', 'name': 'tests.test_parsers.TestParsers.test_junit[jest-junit.xml-]', 'outcome': 'pass'}] == ''">self = &lt;test_parsers.TestParsers object at 0x102182d10&gt;, filename = 'junit.xml', expected = '', check = True
+
+    @pytest.mark.parametrize(
+        "filename,expected,check",
+        [("junit.xml", "", True), ("jest-junit.xml", "", False)],
+    )
+    def test_junit(self, filename, expected, check):
+        with open(filename) as f:
+            junit_string = f.read()
+            res = parse_junit_xml(junit_string)
+            print(res)
+            if check:
+&gt;               assert res == expected
+E               AssertionError: assert [{'duration': '0.010', 'name': 'tests.test_parsers.TestParsers.test_junit[junit.xml-]', 'outcome': 'failure'}, {'duration': '0.063', 'name': 'tests.test_parsers.TestParsers.test_junit[jest-junit.xml-]', 'outcome': 'pass'}] == ''
+
+tests/test_parsers.py:16: AssertionError</failure></testcase><testcase classname="tests.test_parsers.TestParsers" name="test_junit[jest-junit.xml--False]" time="0.064" /></testsuite></testsuites>
+<<<<<< EOF
diff --git a/tests/snapshots/parse_raw_upload__TestParsers__junit__1.json b/tests/snapshots/parse_raw_upload__TestParsers__junit__1.json
@@ -0,0 +1,29 @@
+[
+  {
+    "framework": "Pytest",
+    "testruns": [
+      {
+        "name": "test_junit[junit.xml--True]",
+        "classname": "tests.test_parsers.TestParsers",
+        "duration": 0.001,
+        "outcome": "failure",
+        "testsuite": "pytest",
+        "failure_message": "self = <test_parsers.TestParsers object at 0x102182d10>, filename = 'junit.xml', expected = '', check = True\n\n    @pytest.mark.parametrize(\n        \"filename,expected,check\",\n        [(\"junit.xml\", \"\", True), (\"jest-junit.xml\", \"\", False)],\n    )\n    def test_junit(self, filename, expected, check):\n        with open(filename) as f:\n            junit_string = f.read()\n            res = parse_junit_xml(junit_string)\n            print(res)\n            if check:\n>               assert res == expected\nE               AssertionError: assert [{'duration': '0.010', 'name': 'tests.test_parsers.TestParsers.test_junit[junit.xml-]', 'outcome': 'failure'}, {'duration': '0.063', 'name': 'tests.test_parsers.TestParsers.test_junit[jest-junit.xml-]', 'outcome': 'pass'}] == ''\n\ntests/test_parsers.py:16: AssertionError",
+        "filename": null,
+        "build_url": null,
+        "computed_name": "tests.test_parsers.TestParsers::test_junit[junit.xml--True]"
+      },
+      {
+        "name": "test_junit[jest-junit.xml--False]",
+        "classname": "tests.test_parsers.TestParsers",
+        "duration": 0.064,
+        "outcome": "pass",
+        "testsuite": "pytest",
+        "failure_message": null,
+        "filename": null,
+        "build_url": null,
+        "computed_name": "tests.test_parsers.TestParsers::test_junit[jest-junit.xml--False]"
+      }
+    ]
+  }
+]
diff --git a/tests/test_parse_raw_upload.py b/tests/test_parse_raw_upload.py
@@ -3,9 +3,8 @@
 import zlib
 import json
 from test_results_parser import parse_raw_upload
-
 class TestParsers:
-    def test_junit(self):
+    def test_junit(self, snapshot):
         with open("tests/junit.xml", "b+r") as f:
             file_bytes = f.read()
             raw_upload = {
@@ -28,49 +27,10 @@ def test_junit(self):
 
             readable_files = bytes(readable_files_bytes)
 
-            assert readable_files == f"""# path=junit.xml\n{file_bytes.decode()}\n<<<<<< EOF\n""".encode()
-            
-
-            assert parsing_infos[0]["framework"] == "Pytest"
-            assert parsing_infos[0]["testruns"] == [
-                {
-                    "name": "test_junit[junit.xml--True]",
-                    "classname": "tests.test_parsers.TestParsers",
-                    "duration": 0.001,
-                    "outcome": "failure",
-                    "testsuite": "pytest",
-                    "failure_message": """self = <test_parsers.TestParsers object at 0x102182d10>, filename = 'junit.xml', expected = '', check = True
 
-    @pytest.mark.parametrize(
-        "filename,expected,check",
-        [("junit.xml", "", True), ("jest-junit.xml", "", False)],
-    )
-    def test_junit(self, filename, expected, check):
-        with open(filename) as f:
-            junit_string = f.read()
-            res = parse_junit_xml(junit_string)
-            print(res)
-            if check:
->               assert res == expected
-E               AssertionError: assert [{'duration': '0.010', 'name': 'tests.test_parsers.TestParsers.test_junit[junit.xml-]', 'outcome': 'failure'}, {'duration': '0.063', 'name': 'tests.test_parsers.TestParsers.test_junit[jest-junit.xml-]', 'outcome': 'pass'}] == ''
+            assert snapshot("bin") == readable_files
+            assert snapshot("json") == parsing_infos
 
-tests/test_parsers.py:16: AssertionError""",
-                    "filename": None,
-                    "build_url": None,
-                    "computed_name": "tests.test_parsers.TestParsers::test_junit[junit.xml--True]",
-                },
-                {
-                    "name": "test_junit[jest-junit.xml--False]",
-                    "classname": "tests.test_parsers.TestParsers",
-                    "duration": 0.064,
-                    "outcome": "pass",
-                    "testsuite": "pytest",
-                    "failure_message": None,
-                    "filename": None,
-                    "build_url": None,
-                    "computed_name": "tests.test_parsers.TestParsers::test_junit[jest-junit.xml--False]",
-                }
-            ]
 
 
     def test_json_error(self):
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,5 @@ dev-dependencies = [`
`21`	`21`	`"pytest-cov>=6.0.0",`
`22`	`22`	`"pytest-reportlog>=0.4.0",`
`23`	`23`	`"maturin>=1.7.4",`
	`24`	`+ "pytest-insta>=0.3.0",`
`24`	`25`	`]`