Fix the problem when no real check of new leader was done

Change-Id: I396c3b2be6a0f02c86fd96a9532cc78bc96c3c5b
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/libraries/CarPeople.robot b/csit/libraries/CarPeople.robot
index 62b7de5ff514080d6acc24e4c4c19a47c2c59e82..6c692322a8a0713be47c5b7f5acba31844521875 100644 (file)
--- a/csit/libraries/CarPeople.robot
+++ b/csit/libraries/CarPeople.robot
@@ -79,3 +79,4 @@ Set_Tmp_Variables_For_Shard_For_Nodes
     BuiltIn.Set_Suite_Variable    \${new_follower_sessions}    ${sessions}
     ${first_follower_session} =    Collections.Get_From_List    ${sessions}    0
     BuiltIn.Set_Suite_Variable    \${new_first_follower_session}    ${first_follower_session}
+    BuiltIn.Return_From_Keyword    ${leader}    ${follower_list}

diff --git a/csit/suites/controller/Clustering_Datastore/car_failover_crud_isolation.robot b/csit/suites/controller/Clustering_Datastore/car_failover_crud_isolation.robot
index fe0ca5cfac6fa9e514d118f6b88b95e9143b09ad..db80631c2004f368dac17f0768a619ad1aba811c 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/car_failover_crud_isolation.robot
+++ b/csit/suites/controller/Clustering_Datastore/car_failover_crud_isolation.robot
@@ -50,7 +50,9 @@ Isolate_Original_Car_Leader
 
 Wait_For_New_Leader
     [Documentation]    Wait until new car Leader is elected.
-    BuiltIn.Wait_Until_Keyword_Succeeds    30s    2s    CarPeople.Set_Tmp_Variables_For_Shard_For_Nodes    member_index_list=${car_follower_indices}    shard_name=${SHARD_NAME}    shard_type=${SHARD_TYPE}
+    BuiltIn.Wait_Until_Keyword_Succeeds    30s    2s    ClusterManagement.Verify_Shard_Leader_Elected    ${SHARD_NAME}    ${SHARD_TYPE}    ${True}
+    ...    ${car_leader_index}    member_index_list=${car_follower_indices}
+    CarPeople.Set_Tmp_Variables_For_Shard_For_Nodes    member_index_list=${car_follower_indices}    shard_name=${SHARD_NAME}    shard_type=${SHARD_TYPE}
 
 See_Original_Cars_On_New_Leader
     [Documentation]    GET cars from new Leader, should be the initial ones.