chore(deps): swap out pretty_assertions for similar-asserts (vectordo…

…tdev#14954) The previous crate would take wayyy to long on large inputs, show diffs that were much too large, etc. New crate is much improved. Signed-off-by: Luke Steensen <[email protected]>
zhubby · Oct 26, 2022 · 0c6c8c9 · 0c6c8c9
1 parent d63d75b
commit 0c6c8c9
Show file tree

Hide file tree

Showing 41 changed files with 96 additions and 75 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -344,7 +344,7 @@ base64 = "0.13.1"
 criterion = { version = "0.4.0", features = ["html_reports", "async_tokio"] }
 itertools = { version = "0.10.5", default-features = false }
 libc = "0.2.136"
-pretty_assertions = "1.3.0"
+similar-asserts = "1.4.2"
 proptest = "1.0"
 quickcheck = "1.0.3"
 reqwest = { version = "0.11", features = ["json"] }

diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml
@@ -35,7 +35,7 @@ vector-core = { path = "../vector-core", default-features = false }
 futures = { version = "0.3", default-features = false }
 indoc = { version = "1", default-features = false }
 tokio = { version = "1", features = ["test-util"] }
-pretty_assertions = "1"
+similar-asserts = "1.4.2"
 
 [features]
 syslog = ["dep:syslog_loose"]
diff --git a/lib/codecs/src/decoding/format/gelf.rs b/lib/codecs/src/decoding/format/gelf.rs
@@ -210,8 +210,8 @@ mod tests {
     use bytes::Bytes;
     use chrono::{DateTime, NaiveDateTime, Utc};
     use lookup::event_path;
-    use pretty_assertions::assert_eq;
     use serde_json::json;
+    use similar_asserts::assert_eq;
     use smallvec::SmallVec;
     use value::Value;
     use vector_core::{config::log_schema, event::Event};

diff --git a/lib/codecs/tests/native.rs b/lib/codecs/tests/native.rs
@@ -8,7 +8,7 @@ use codecs::{
     decoding::format::Deserializer, NativeDeserializerConfig, NativeJsonDeserializerConfig,
     NativeJsonSerializerConfig, NativeSerializerConfig,
 };
-use pretty_assertions::assert_eq;
+use similar_asserts::assert_eq;
 use tokio_util::codec::Encoder;
 use vector_core::config::LogNamespace;
 

diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
@@ -74,7 +74,7 @@ features = ["full"]
 criterion = "0.4"
 quickcheck = "1"
 tempfile = "3.3.0"
-pretty_assertions = "1.3.0"
+similar-asserts = "1.4.2"
 
 [[bench]]
 name = "buffer"

diff --git a/lib/file-source/src/checkpointer.rs b/lib/file-source/src/checkpointer.rs
@@ -420,7 +420,7 @@ impl Checkpointer {
 #[cfg(test)]
 mod test {
     use chrono::{Duration, Utc};
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
     use tempfile::tempdir;
 
     use super::{

diff --git a/lib/vector-common/src/event_data_eq.rs b/lib/vector-common/src/event_data_eq.rs
@@ -18,7 +18,12 @@ macro_rules! assert_event_data_eq {
                     left.event_data_eq(right),
                     "assertion failed: {}\n\n{}\n",
                     $message,
-                    pretty_assertions::Comparison::new(left, right),
+                    similar_asserts::SimpleDiff::from_str(
+                        format!("{:#?}", left).as_str(),
+                        format!("{:#?}", right).as_str(),
+                        "left",
+                        "right"
+                    ),
                 );
             }
         }

diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
@@ -83,7 +83,7 @@ criterion = { version = "0.4.0", features = ["html_reports"] }
 env-test-util = "1.0.1"
 quickcheck = "1.0.3"
 proptest = "1.0"
-pretty_assertions = "1.3.0"
+similar-asserts = "1.4.2"
 tokio-test = "0.4.2"
 ndarray = "0.15.6"
 ndarray-stats = "0.5.1"

diff --git a/lib/vector-core/src/event/metric/mod.rs b/lib/vector-core/src/event/metric/mod.rs
@@ -606,7 +606,7 @@ mod test {
     use std::collections::BTreeSet;
 
     use chrono::{offset::TimeZone, DateTime, Utc};
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
 
     use super::*;
 

diff --git a/lib/vector-core/src/event/test/serialization.rs b/lib/vector-core/src/event/test/serialization.rs
@@ -1,8 +1,8 @@
 use bytes::{Buf, BufMut, BytesMut};
-use pretty_assertions::assert_eq;
 use prost::Message;
 use quickcheck::{QuickCheck, TestResult};
 use regex::Regex;
+use similar_asserts::assert_eq;
 use vector_buffers::encoding::Encodable;
 use vector_common::btreemap;
 

diff --git a/lib/vector-core/src/event/util/log/all_fields.rs b/lib/vector-core/src/event/util/log/all_fields.rs
@@ -150,8 +150,8 @@ impl<'a> Serialize for FieldsIter<'a> {
 
 #[cfg(test)]
 mod test {
-    use pretty_assertions::assert_eq;
     use serde_json::json;
+    use similar_asserts::assert_eq;
 
     use super::{super::test::fields_from_json, *};
 

diff --git a/lib/vector-core/src/event/vrl_target.rs b/lib/vector-core/src/event/vrl_target.rs
@@ -551,7 +551,7 @@ enum MetricPathError<'a> {
 mod test {
     use chrono::{offset::TimeZone, Utc};
     use lookup::owned_value_path;
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
     use vector_common::btreemap;
     use vrl_lib::Target;
 

diff --git a/src/config/graph.rs b/src/config/graph.rs
@@ -360,7 +360,7 @@ impl Graph {
 
 #[cfg(test)]
 mod test {
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
 
     use super::*;
 

diff --git a/src/line_agg.rs b/src/line_agg.rs
@@ -394,7 +394,7 @@ impl<C> Aggregate<C> {
 mod tests {
     use bytes::Bytes;
     use futures::SinkExt;
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
     use std::fmt::Write as _;
 
     use super::*;

diff --git a/src/sinks/aws_cloudwatch_logs/integration_tests.rs b/src/sinks/aws_cloudwatch_logs/integration_tests.rs
@@ -10,7 +10,7 @@ use chrono::Duration;
 use codecs::TextSerializerConfig;
 use futures::{stream, StreamExt};
 use http::Uri;
-use pretty_assertions::assert_eq;
+use similar_asserts::assert_eq;
 
 use super::*;
 use crate::aws::create_client;

diff --git a/src/sinks/aws_cloudwatch_metrics/tests.rs b/src/sinks/aws_cloudwatch_metrics/tests.rs
@@ -2,7 +2,7 @@
 
 use aws_sdk_cloudwatch::types::DateTime;
 use chrono::{offset::TimeZone, Utc};
-use pretty_assertions::assert_eq;
+use similar_asserts::assert_eq;
 
 use super::*;
 use crate::event::metric::{Metric, MetricKind, MetricValue, StatisticKind};

diff --git a/src/sinks/aws_s3/integration_tests.rs b/src/sinks/aws_s3/integration_tests.rs
@@ -19,7 +19,7 @@ use bytes::Buf;
 use codecs::{encoding::FramingConfig, TextSerializerConfig};
 use flate2::read::MultiGzDecoder;
 use futures::{stream, Stream};
-use pretty_assertions::assert_eq;
+use similar_asserts::assert_eq;
 use tokio_stream::StreamExt;
 use vector_core::{
     config::proxy::ProxyConfig,

diff --git a/src/sinks/datadog/events/tests.rs b/src/sinks/datadog/events/tests.rs
@@ -8,7 +8,7 @@ use futures::{
 };
 use hyper::StatusCode;
 use indoc::indoc;
-use pretty_assertions::assert_eq;
+use similar_asserts::assert_eq;
 use vector_core::event::{BatchNotifier, BatchStatus};
 
 use super::*;

diff --git a/src/sinks/elasticsearch/retry.rs b/src/sinks/elasticsearch/retry.rs
@@ -106,7 +106,7 @@ fn get_error_reason(body: &str) -> String {
 mod tests {
     use bytes::Bytes;
     use http::Response;
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
 
     use super::*;
     use crate::event::EventStatus;

diff --git a/src/sinks/file/mod.rs b/src/sinks/file/mod.rs
@@ -407,7 +407,7 @@ mod tests {
     use std::convert::TryInto;
 
     use futures::{stream, SinkExt};
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
     use vector_core::{event::LogEvent, sink::VectorSink};
 
     use super::*;

diff --git a/src/sinks/humio/metrics.rs b/src/sinks/humio/metrics.rs
@@ -195,7 +195,7 @@ mod tests {
     use chrono::{offset::TimeZone, Utc};
     use futures::stream;
     use indoc::indoc;
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
 
     use super::*;
     use crate::{

diff --git a/src/sinks/influxdb/metrics.rs b/src/sinks/influxdb/metrics.rs
@@ -433,7 +433,7 @@ fn to_fields(value: f64) -> HashMap<String, Field> {
 #[cfg(test)]
 mod tests {
     use indoc::indoc;
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
 
     use super::*;
     use crate::{
@@ -938,7 +938,7 @@ mod tests {
 mod integration_tests {
     use chrono::{SecondsFormat, Utc};
     use futures::stream;
-    use pretty_assertions::assert_eq;
+    use similar_asserts::assert_eq;
 
     use crate::{
         config::{SinkConfig, SinkContext},