Fix all the tests except the sentinel one

Author: palfrey

nativelink-redis-tester/src/fake_redis.rs

@@ -95,14 +95,37 @@ pub fn add_to_response_raw<B: BuildHasher>(
 }
 
 fn setinfo(responses: &mut HashMap<String, String>) {
-    // Library sends both lib-name and lib-ver in one go, so we respond to both
-    add_to_response(
-        responses,
+    // We do raw inserts of command here, because the library sends 3/4 commands in one go
+    // They always start with HELLO, then optionally SELECT, so we use this to differentiate
+    let hello = cmd_as_string(redis::cmd("HELLO").arg("3"));
+    let setinfo = cmd_as_string(
         redis::cmd("CLIENT")
             .arg("SETINFO")
             .arg("LIB-NAME")
             .arg("redis-rs"),
-        vec![Value::Okay, Value::Okay],
+    );
+    responses.insert(
+        vec![hello.clone(), setinfo.clone()].join(""),
+        args_as_string(vec![
+            Value::Map(vec![(
+                Value::SimpleString("server".into()),
+                Value::SimpleString("redis".into()),
+            )]),
+            Value::Okay,
+            Value::Okay,
+        ]),
+    );
+    responses.insert(
+        vec![hello, cmd_as_string(redis::cmd("SELECT").arg(3)), setinfo].join(""),
+        args_as_string(vec![
+            Value::Map(vec![(
+                Value::SimpleString("server".into()),
+                Value::SimpleString("redis".into()),
+            )]),
+            Value::Okay,
+            Value::Okay,
+            Value::Okay,
+        ]),
     );
 }
 

nativelink-store/src/redis_store.rs

@@ -601,6 +601,13 @@ impl RedisStore<ConnectionManager, StandardRedisManager<ConnectionManager>> {
         let mut parsed_addr = local_addr
             .replace("redis+sentinel://", "redis://")
             .into_connection_info()?;
+
+        let redis_settings = parsed_addr
+            .redis_settings()
+            .clone()
+            // We need RESP3 here because we want to do set_push_sender
+            .set_protocol(redis::ProtocolVersion::RESP3);
+        parsed_addr = parsed_addr.set_redis_settings(redis_settings);
         debug!(?parsed_addr, "Parsed redis addr");
 
         let client = timeout(

nativelink-store/tests/redis_store_test.rs

@@ -641,7 +641,7 @@ fn test_connection_errors() {
         Error {
             code: Code::DeadlineExceeded,
             messages: vec![
-                "deadline has elapsed".into(),
+                "Io: timed out".into(),
                 format!("While connecting to redis with url: redis://nativelink.com:6379/")
             ]
         },
@@ -671,7 +671,7 @@ async fn test_health() {
         } => {
             assert_eq!(
                 struct_name,
-                "nativelink_store::redis_store::RedisStore<redis::aio::connection_manager::ConnectionManager, redis::aio::pubsub::PubSub>"
+                "nativelink_store::redis_store::RedisStore<redis::aio::connection_manager::ConnectionManager, nativelink_store::redis_store::StandardRedisManager<redis::aio::connection_manager::ConnectionManager>>"
             );
             assert!(
                 message.starts_with("Store.update_oneshot() failed: Error { code: DeadlineExceeded, messages: [\"Io: timed out\", \"While appending to temp key ("),
@@ -814,7 +814,7 @@ async fn test_redis_connect_timeout() {
         Error {
             code: Code::DeadlineExceeded,
             messages: vec![
-                "deadline has elapsed".into(),
+                "Io: timed out".into(),
                 format!("While connecting to redis with url: redis://127.0.0.1:{port}/")
             ]
         },