tests: modify tests

Author: echo724

duva/tests/cluster_ops/test_cluster_meet.rs

@@ -30,7 +30,8 @@ fn run_cluster_meet(append_only: bool) -> anyhow::Result<()> {
     while until > std::time::Instant::now() {
         let res = client_handler.send_and_get_vec("cluster info", 1);
         if res.contains(&"cluster_known_nodes:3".to_string()) {
-            assert_eq!(client_handler.send_and_get("role"), "leader");
+            let role_response = client_handler.send_and_get_vec("role", 2);
+            assert!(role_response.contains(&format!("127.0.0.1:{}:{}", env3.port, "leader")));
             success_cnt += 1;
             break;
         }
@@ -42,7 +43,8 @@ fn run_cluster_meet(append_only: bool) -> anyhow::Result<()> {
     while until > std::time::Instant::now() {
         let res = replica_handler.send_and_get_vec("cluster info", 1);
         if res.contains(&"cluster_known_nodes:3".to_string()) {
-            assert_eq!(replica_handler.send_and_get("role"), "follower");
+            let role_response = client_handler.send_and_get_vec("role", 2);
+            assert!(role_response.contains(&format!("127.0.0.1:{}:{}", env4.port, "follower")));
             success_cnt += 1;
             break;
         }

duva/tests/cluster_ops/test_lazy_discovery.rs

@@ -24,8 +24,9 @@ fn run_lazy_discovery_of_leader(with_append_only: bool) -> anyhow::Result<()> {
     assert_eq!(p1_h.send_and_get(format!("REPLICAOF 127.0.0.1 {}", &env2.port)), "OK");
 
     // THEN
-    assert_eq!(p1_h.send_and_get("role"), "follower");
-    assert_eq!(p2_h.send_and_get("role"), "leader");
+    let role_response = p1_h.send_and_get_vec("role", 2);
+    assert!(role_response.contains(&format!("127.0.0.1:{}:{}", p1.port, "follower")));
+    assert!(role_response.contains(&format!("127.0.0.1:{}:{}", env2.port, "leader")));
 
     // * Following is required to test replicaof successuflly update topology changes
     p1.terminate()?;

duva/tests/cluster_ops/test_reconnection_on_reboot.rs

@@ -24,13 +24,13 @@ fn run_reconnection_on_reboot(with_append_only: bool) -> anyhow::Result<()> {
     //THEN
 
     let mut cli_to_p2 = Client::new(p2.port);
-    let p2_role = cli_to_p2.send_and_get("ROLE");
+    let p2_role = cli_to_p2.send_and_get_vec("ROLE", 2);
 
     let mut cli_to_p1 = Client::new(p1.port);
-    let p1_role = cli_to_p1.send_and_get("ROLE");
+    let p1_role = cli_to_p1.send_and_get_vec("ROLE", 2);
 
-    assert_eq!(p2_role, "follower");
-    assert_eq!(p1_role, "leader");
+    assert!(p2_role.contains(&format!("127.0.0.1:{}:{}", p2.port, "follower")));
+    assert!(p1_role.contains(&format!("127.0.0.1:{}:{}", p1.port, "leader")));
 
     // Check that the values are still there
     assert_eq!(cli_to_p2.send_and_get("GET x"), "value1");

duva/tests/replication_ops/test_leader_election.rs

@@ -43,16 +43,15 @@ fn run_set_twice_after_election(with_append_only: bool) -> anyhow::Result<()> {
 
     panic_if_election_not_done(follower_p1.port, follower_p2.port);
 
-    let res = h1.send_and_get("role");
-    let res2 = h2.send_and_get("role");
+    let res = h1.send_and_get_vec("role", 3);
 
-    if res.contains(&"leader".to_string()) {
+    if res.contains(&format!("127.0.0.1:{}:{}", follower_p1.port, "leader")) {
         // THEN - one of the replicas should become the leader
         assert_eq!(h1.send_and_get("set 1 2"), "OK");
         assert_eq!(h1.send_and_get("set 2 3"), "OK");
     }
 
-    if res2 == "leader" {
+    if res.contains(&format!("127.0.0.1:{}:{}", follower_p2.port, "leader")) {
         // THEN - one of the replicas should become the leader
         assert_eq!(h2.send_and_get("set 1 2"), "OK");
         assert_eq!(h2.send_and_get("set 2 3"), "OK");
@@ -112,22 +111,21 @@ fn panic_if_election_not_done(port1: u16, port2: u16) {
     let mut first_election_cnt = 0;
     let mut flag = false;
     let mut h1 = Client::new(port1);
-    let mut h2 = Client::new(port2);
 
     let start = std::time::Instant::now();
     while first_election_cnt < 50 {
-        let res = h1.send_and_get("role");
-        let res2 = h2.send_and_get("role");
+        let res = h1.send_and_get_vec("role", 2);
         println!(
-            "[{}ms] Poll {}: port1={} port2={} res1={} res2={}",
+            "[{}ms] Poll {}: port1={} port2={} res={:?}",
             start.elapsed().as_millis(),
             first_election_cnt,
             port1,
             port2,
             res,
-            res2
         );
-        if res == "leader" || res2 == "leader" {
+        if res.contains(&format!("127.0.0.1:{}:{}", port1, "leader"))
+            || res.contains(&format!("127.0.0.1:{}:{}", port2, "leader"))
+        {
             flag = true;
             break;
         }