Replace 'Run Keyword Unless'

[integration/test.git] / csit / suites / controller / singleton_service / global_rpc_kill.robot

diff --git a/csit/suites/controller/singleton_service/global_rpc_kill.robot b/csit/suites/controller/singleton_service/global_rpc_kill.robot
index 3b105fa494d8823085bb16af60fb4f6140cd2555..04f83b43cfa6901f8223fde87320b15dd9f105ea 100644 (file)
--- a/csit/suites/controller/singleton_service/global_rpc_kill.robot
+++ b/csit/suites/controller/singleton_service/global_rpc_kill.robot
@@ -38,8 +38,9 @@ Rpc_Before_Stopping_On_Owner
 
 Rpc_Before_Stop_On_Successors
     [Documentation]    Run rpc on non owher cluster nodes.
-    : FOR    ${idx}    IN    @{brt_successors}
-    \    Run_Rpc    ${idx}
+    FOR    ${idx}    IN    @{brt_successors}
+        Run_Rpc    ${idx}
+    END
 
 Stop_Current_Owner_Member
     [Documentation]    Stop cluster node which is the owner.
@@ -55,8 +56,9 @@ Verify_New_Basic_Rpc_Test_Owner_Elected
 
 Rpc_On_Remained_Cluster_Nodes
     [Documentation]    Run rpc on remained cluster nodes.
-    : FOR    ${idx}    IN    @{old_brt_successors}
-    \    BuiltIn.Wait_Until_Keyword_Succeeds    60s    5s    Run_Rpc    ${idx}
+    FOR    ${idx}    IN    @{old_brt_successors}
+        BuiltIn.Wait_Until_Keyword_Succeeds    60s    5s    Run_Rpc    ${idx}
+    END
 
 Restart_Stopped_Member
     [Documentation]    Restart stopped node
@@ -78,8 +80,9 @@ Rpc_After_Rejoin_On_Old_Owner
 Rpc_After_Rejoin_On_All
     [Documentation]    Run rpc again on all nodes.
     Run_Rpc    ${brt_owner}
-    : FOR    ${idx}    IN    @{brt_successors}
-    \    Run_Rpc    ${idx}
+    FOR    ${idx}    IN    @{brt_successors}
+        Run_Rpc    ${idx}
+    END
 
 *** Keywords ***
 Setup_Suite
@@ -94,14 +97,14 @@ Run_Rpc
     ${session} =    Resolve_Http_Session_For_Member    member_index=${node_idx}
     ${out} =    TemplatedRequests.Get_From_Uri    ${EOS_URL}    session=${session}
     KarafKeywords.Log_Message_To_Controller_Karaf    EOS rest resp: ${out}
-    TemplatedRequests.Post_To_Uri    ${RPC_URL}    ${EMPTY}    ${EMPTY_DICT}    ${EMPTY_DICT}    session=${session}
+    TemplatedRequests.Post_To_Uri    ${RPC_URL}    ${EMPTY}    ${HEADERS_XML}    ${ACCEPT_XML}    session=${session}
 
 Verify_Owner_Elected
     [Arguments]    ${new_elected}    ${old_owner}    ${node_to_ask}
     [Documentation]    Verify new owner was elected or remained the same.
     ${owner}    ${successors}=    Get_Present_Brt_Owner_And_Successors    ${node_to_ask}
     BuiltIn.Run_Keyword_If    ${new_elected}    BuiltIn.Should_Not_Be_Equal_As_Numbers    ${old_owner}    ${owner}
-    BuiltIn.Run_Keyword_Unless    ${new_elected}    BuiltIn.Should_Be_Equal_As_numbers    ${old_owner}    ${owner}
+    BuiltIn.Run_Keyword_If    not ${new_elected}    BuiltIn.Should_Be_Equal_As_numbers    ${old_owner}    ${owner}
 
 Get_Present_Brt_Owner_And_Successors
     [Arguments]    ${node_to_ask}    ${store}=${False}