Tweak random tests

diff --git a/Cargo.toml b/Cargo.toml
index 7b8e51dcdebbe2d3cf0a023270ea5f5ee1556662..af762628fc610a7d9834b082e7d114b5719d6bee 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ serde = ["dep:serde", "dep:serde_arrays", "enumset/serde"]
 server = []
 
 [dependencies]
-mt_ser = { path = "../mt_ser" }
+mt_ser = { git = "https://github.com/minetest-rust/mt_ser" }
 enumset = { git = "https://github.com/Lymia/enumset" }
 generate-random = { git = "https://github.com/minetest-rust/generate-random", features = ["enumset"], optional = true }
 rand = { version = "0.8.5", optional = true }
@@ -20,7 +20,6 @@ serde_arrays = { version = "0.1.0", optional = true }
 
 [dev-dependencies]
 libtest-mimic = "0.6.0"
-serde_json = "1.0.93"
 
 [[test]]
 name = "random"

diff --git a/tests/random.rs b/tests/random.rs
index 4d2ad42cd9b2f32c689f38530586725af18bafe1..a9d16092b1ef5f4f9eed65764c7fbd15432070e3 100644 (file)
--- a/tests/random.rs
+++ b/tests/random.rs
@@ -1,4 +1,4 @@
-use libtest_mimic::{Arguments, Failed, Trial};
+use libtest_mimic::{Arguments, Trial};
 
 use mt_net::{generate_random::GenerateRandomVariant, rand, ToCltPkt, ToSrvPkt};
 use mt_ser::{DefCfg, MtDeserialize, MtSerialize};
@@ -21,14 +21,20 @@ where
                     .map_err(|e| format!("serialize error: {e}\ninput: {input:?}"))?;
 
                 let mut reader = std::io::Cursor::new(writer);
-                let output = T::mt_deserialize::<DefCfg>(&mut reader)
-                    .map_err(|e| format!("deserialize error: {e}\ninput: {input:?}"))?;
+                let output = T::mt_deserialize::<DefCfg>(&mut reader).map_err(|e| {
+                    format!(
+                        "deserialize error: {e}\ninput: {input:?}\npayload: {:?}",
+                        reader.get_ref()
+                    )
+                })?;
 
                 if input != output {
                     return Err(format!(
                         "output did not match input\n\
                                                input: {input:?}\n\
+                                               payload: {:?}\n\
                                                output: {output:?}",
+                        reader.get_ref(),
                     )
                     .into());
                 }

diff --git a/tests/reserialize/.gitignore b/tests/reserialize/.gitignore
index 49a0751d10a7c826204de077fc8317508767d695..5d5b471ab975a8f191bf972e149b0f12c53c8d9e 100644 (file)
--- a/tests/reserialize/.gitignore
+++ b/tests/reserialize/.gitignore
@@ -1 +1 @@
-validate
+reserialize