From f911f49db95fc2993b10411838ef2cc50fd1af13 Mon Sep 17 00:00:00 2001
From: Lucas Kent <rubickent@gmail.com>
Date: Tue, 16 Aug 2022 13:07:03 +1000
Subject: [PATCH] Improve redis int test assert messages (#746)

---
 .../redis_int_tests/basic_driver_tests.rs     | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/shotover-proxy/tests/redis_int_tests/basic_driver_tests.rs b/shotover-proxy/tests/redis_int_tests/basic_driver_tests.rs
index f07048f8a..c03d34e24 100644
--- a/shotover-proxy/tests/redis_int_tests/basic_driver_tests.rs
+++ b/shotover-proxy/tests/redis_int_tests/basic_driver_tests.rs
@@ -68,8 +68,10 @@ async fn test_info(connection: &mut Connection) {
     );
     assert_eq!(info.get("role"), Some("master".to_string()));
     assert_eq!(info.get("loading"), Some(false));
-    assert!(!info.is_empty());
-    assert!(info.contains_key(&"role"));
+    assert!(
+        info.contains_key(&"role"),
+        "expected info to contain key 'role' but was {info:?}"
+    );
 }
 
 async fn test_keys_hiding(connection: &mut Connection, flusher: &mut Flusher) {
@@ -134,9 +136,18 @@ async fn test_save(connection: &mut Connection) {
         .await
         .unwrap();
 
-    assert!(lastsave1 > 0);
-    assert!(lastsave2 > 0);
-    assert!(lastsave2 > lastsave1);
+    assert!(
+        lastsave1 > 0,
+        "expected lastsave1 > 0, but lastsave was {lastsave1}"
+    );
+    assert!(
+        lastsave2 > 0,
+        "expected lastsave2 > 0, but lastsave was {lastsave2}"
+    );
+    assert!(
+        lastsave2 > lastsave1,
+        "expected lastsave2 > lastsave1, but was {lastsave2} > {lastsave1}"
+    );
 }
 
 async fn test_ping_echo(connection: &mut Connection) {
@@ -157,8 +168,14 @@ async fn test_time(connection: &mut Connection) {
     let (time_seconds, extra_ms): (u64, u64) =
         redis::cmd("TIME").query_async(connection).await.unwrap();
 
-    assert!(time_seconds > 0);
-    assert!(extra_ms < 1_000_000);
+    assert!(
+        time_seconds > 0,
+        "expected time_seconds > 0, but time_seconds was {time_seconds}"
+    );
+    assert!(
+        extra_ms < 1_000_000,
+        "expected extra_ms < 1_000_000, but extra_ms was {extra_ms}"
+    );
 }
 
 async fn test_time_cluster(connection: &mut Connection) {
@@ -640,9 +657,10 @@ async fn test_nice_hash_api(connection: &mut Connection) {
         found.insert(item);
     }
 
-    assert_eq!(found.len(), 2);
-    assert!(found.contains(&("f3".to_string(), 4)));
-    assert!(found.contains(&("f4".to_string(), 8)));
+    assert_eq!(
+        found,
+        HashSet::from([("f3".to_string(), 4), ("f4".to_string(), 8)])
+    );
 }
 
 async fn test_nice_list_api(connection: &mut Connection) {