fix the stuff i broke while merging

Author: joseph-sentry

Cargo.lock

@@ -8,7 +8,9 @@ name = "test_results_parser"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-# Version 0.23 currently suffers from https://github.com/PyO3/pyo3/issues/4723
+anyhow = "1.0.94"
+base16ct = { version = "0.2.0", features = ["std"] }
+indexmap = "2.6.0"
 pyo3 = { version = "0.23.3", features = ["abi3-py312", "anyhow"] }
 quick-xml = "0.37.1"
 regex = "1.11.1"

Cargo.toml

@@ -21,5 +21,4 @@ dev-dependencies = [
     "pytest-cov>=6.0.0",
     "pytest-reportlog>=0.4.0",
     "maturin>=1.7.4",
-    "msgpack>=1.1.0",
 ]

pyproject.toml

@@ -1,8 +1,7 @@
+use crate::testrun::Framework;
 use quick_xml::escape::unescape;
 use std::{borrow::Cow, collections::HashSet};
 
-use crate::testrun::Framework;
-
 fn compute_pytest_using_filename(classname: &str, name: &str, filename: &str) -> String {
     let path_components = filename.split('/').count();
 

src/compute_name.rs

@@ -16,16 +16,12 @@ use crate::testrun::ParsingInfo;
 #[derive(Deserialize, Debug, Clone)]
 struct TestResultFile {
     filename: String,
-    #[serde(skip_deserializing)]
-    _format: String,
     data: String,
-    #[serde(skip_deserializing)]
-    _labels: Vec<String>,
 }
 #[derive(Deserialize, Debug, Clone)]
 struct RawTestResultUpload {
     #[serde(default)]
-    network: Option<Vec<String>>,
+    network: Option<HashSet<String>>,
     test_results_files: Vec<TestResultFile>,
 }
 
@@ -57,10 +53,10 @@ fn serialize_to_legacy_format(readable_files: Vec<ReadableFile>) -> Vec<u8> {
 pub fn parse_raw_upload(raw_upload_bytes: &[u8]) -> anyhow::Result<(Vec<ParsingInfo>, Vec<u8>)> {
     let upload: RawTestResultUpload =
         serde_json::from_slice(raw_upload_bytes).context("Error deserializing json")?;
-    let network: Option<HashSet<String>> = upload.network.map(|v| v.into_iter().collect());
+    let network: Option<HashSet<String>> = upload.network;
 
-    let mut results: Vec<ParsingInfo> = Vec::new();
-    let mut readable_files: Vec<ReadableFile> = Vec::new();
+    let mut results: Vec<ParsingInfo> = Vec::with_capacity(upload.test_results_files.len());
+    let mut readable_files: Vec<ReadableFile> = Vec::with_capacity(upload.test_results_files.len());
 
     for file in upload.test_results_files {
         let decoded_file_bytes = BASE64_STANDARD

src/raw_upload.rs

@@ -1,15 +1,28 @@
 from datetime import datetime, timezone
+import json
+import base64
+import zlib
 
 from test_results_parser import (
-    parse_junit_xml,
+    parse_raw_upload,
     AggregationReader,
     BinaryFormatWriter,
 )
 
 def test_aggregation():
     with open("./tests/junit.xml", "br") as f:
         junit_file = f.read()
-    parsed = parse_junit_xml(junit_file)
+
+        raw_upload = {
+            "test_results_files": [
+                {
+                    "filename": "test_results.json",
+                    "data": base64.b64encode(zlib.compress(junit_file)).decode("utf-8"),
+                }
+            ]
+        }
+
+    parsed, _ = parse_raw_upload(json.dumps(raw_upload).encode("utf-8"))
 
     now = int(datetime.now(timezone.utc).timestamp())
 
@@ -18,7 +31,7 @@ def test_aggregation():
         timestamp=now,
         commit_hash="e9fcd08652d091fa0c8d28e323c24fb0f4acf249",
         flags=["upload", "flags"],
-        testruns=parsed.testruns,
+        testruns=parsed[0]["testruns"],
     )
 
     serialized = writer.serialize()