Use DELETED_STATUS_CODES instead of 404

[integration/test.git] / csit / suites / controller / ThreeNodes_Datastore / puts_during_isolation.robot

diff --git a/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot b/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot
index 093a810445dae508290a5409649898a43da3f5c8..e88f814ed60024e64eb10fcd9b1c2f27d15ac424 100644 (file)
--- a/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot
+++ b/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot
@@ -16,12 +16,13 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      critical
 Library           RequestsLibrary
 Library           SSHLibrary
-Resource          ${CURDIR}/../../../variables/Variables.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/RemoteBash.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
+Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/RemoteBash.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
+Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
+Resource          ${CURDIR}/../../../libraries/Utils.robot
+Resource          ${CURDIR}/../../../variables/Variables.robot
 
 *** Variables ***
 ${ITEM_COUNT}     ${10000}
@@ -60,7 +61,7 @@ Verify_Cars_Configured
     [Documentation]    Verify that all cars are configured.
     BuiltIn.Wait_Until_Keyword_Succeeds    120x    2s    SSHLibrary.Read_Until_Prompt
     ${session} =    Resolve_Http_Session_For_Member    member_index=${new_leader_index}
-    Verify_Cars_Count    ${ITEM_COUNT}    ${session}
+    BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    Verify_Cars_Count    ${ITEM_COUNT}    ${session}
 
 Rejoin_Isolated_Member
     [Documentation]    Rejoin isolated node
@@ -72,7 +73,7 @@ Delete Cars
     ${rsp}=    RequestsLibrary.Delete Request    ${session}    ${CARURL}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    ${session}    ${CARURL}
-    Should Be Equal As Numbers    404    ${rsp.status_code}
+    Should Be Equal As Numbers    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 *** Keywords ***
 Start Suite
@@ -130,7 +131,7 @@ Get_Cars_Count
     [Arguments]    ${session}
     [Documentation]    Count car items in config ds.
     ${resp}=    RequestsLibrary.Get_Request    ${session}    ${CARURL}
-    ${count} =    BuiltIn.Evaluate    len(${resp.json()}["cars"]["car-entry"])
+    ${count} =    BuiltIn.Evaluate    len(${resp.json()}[cars][car-entry])
     BuiltIn.Return_From_Keyword    ${count}
 
 Ensure_Cars_Being_Configured