Fixed tests after rebasing

amazon-contributing · Jan 25, 2024 · 1314607 · 1314607
1 parent 6b6081e
commit 1314607
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/redis/tests/support/mock_cluster.rs b/redis/tests/support/mock_cluster.rs
@@ -54,6 +54,13 @@ impl MockConnectionBehavior {
     }
 }
 
+pub fn add_new_mock_connection_behavior(name: &str, handler: Handler) {
+    MOCK_CONN_BEHAVIORS
+        .write()
+        .unwrap()
+        .insert(name.to_string(), MockConnectionBehavior::new(name, handler));
+}
+
 pub fn modify_mock_connection_behavior(name: &str, func: impl FnOnce(&mut MockConnectionBehavior)) {
     func(
         MOCK_CONN_BEHAVIORS
@@ -433,10 +440,7 @@ impl MockEnv {
             .unwrap();
 
         let id = id.to_string();
-        MOCK_CONN_BEHAVIORS.write().unwrap().insert(
-            id.clone(),
-            MockConnectionBehavior::new(&id, Arc::new(move |cmd, port| handler(cmd, port))),
-        );
+        add_new_mock_connection_behavior(&id, Arc::new(move |cmd, port| handler(cmd, port)));
         let client = client_builder.build().unwrap();
         let connection = client.get_generic_connection().unwrap();
         #[cfg(feature = "cluster-async")]

diff --git a/redis/tests/test_cluster_async.rs b/redis/tests/test_cluster_async.rs
@@ -593,13 +593,7 @@ fn test_cluster_async_cannot_connect_to_server_with_unknown_host_name() {
     };
     let client_builder = ClusterClient::builder(vec![&*format!("redis://{name}")]);
     let client = client_builder.build().unwrap();
-    MOCK_CONN_UTILS.write().unwrap().insert(
-        name.to_string(),
-        MockConnectionUtils {
-            handler: Some(Arc::new(handler)),
-            ..Default::default()
-        },
-    );
+    add_new_mock_connection_behavior(name, Arc::new(handler));
     let connection = client.get_generic_connection::<MockConnection>();
     assert!(connection.is_err());
     let err = connection.err().unwrap();