Use DELETED_STATUS_CODES instead of 404

data-missing will now give 409 in Aluminium and beyond
by default so we can look for both 404 and 409 which is
in DELETED_STATUS_CODES

JIRA: INTTEST-102
Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Change-Id: I6f979e3a46b5121f8c98db1511e734c400a70f90

diff --git a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
index 7576a6b509f3ff9930116f7668d084a816ea7c93..abeef908c6b33abb1f48b940043c4832f0be7ca0 100644 (file)
--- a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
@@ -20,11 +20,12 @@ Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           RequestsLibrary
 Library           SSHLibrary
 Library           XML
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/RemoteBash.robot
+Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../libraries/Utils.robot
+Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${ITEM_COUNT}     ${10000}
@@ -84,21 +85,21 @@ 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}
 
 Delete People
     [Documentation]    Remove people from the datastore
     ${rsp}=    RequestsLibrary.Delete Request    session    ${peopleurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    session    ${peopleurl}
-    Should Be Equal As Numbers    404    ${rsp.status_code}
+    Should Be Equal As Numbers    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 Delete CarPeople
     [Documentation]    Remove car-people entries from the datastore
     ${rsp}=    RequestsLibrary.Delete Request    session    ${carpeopleurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    session    ${carpeopleurl}
-    Should Be Equal As Numbers    404    ${rsp.status_code}
+    Should Be Equal As Numbers    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 *** Keywords ***
 Start Suite

diff --git a/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
index ee54db2017d059e3e16574c83efe45f50440a359..83f513c97da818f906f2c50f39563e307d006ab8 100644 (file)
--- a/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
@@ -20,13 +20,14 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Library           RequestsLibrary
 Library           SSHLibrary
 Library           XML
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/CarPeople.robot
+Resource          ../../../libraries/ClusterManagement.robot
 Resource          ../../../libraries/RemoteBash.robot
+Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/SSHKeywords.robot
-Resource          ../../../libraries/ClusterManagement.robot
-Resource          ../../../libraries/CarPeople.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../libraries/Utils.robot
+Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${ITEM_COUNT}     ${10000}
@@ -87,21 +88,21 @@ Delete Cars
     ${rsp}=    RequestsLibrary.Delete Request    ${car_leader_session}    ${carurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${carurl}
-    Should Be Equal As Numbers    404    ${rsp.status_code}
+    Should Be Equal As Numbers    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 Delete People
     [Documentation]    Remove people from the datastore
     ${rsp}=    RequestsLibrary.Delete Request    ${car_leader_session}    ${peopleurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${peopleurl}
-    Should Be Equal As Numbers    404    ${rsp.status_code}
+    Should Be Equal As Numbers    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 Delete CarPeople
     [Documentation]    Remove car-people entries from the datastore
     ${rsp}=    RequestsLibrary.Delete Request    ${car_leader_session}    ${carpeopleurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${carpeopleurl}
-    Should Be Equal As Numbers    404    ${rsp.status_code}
+    Should Be Equal As Numbers    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 *** Keywords ***
 Start Suite

diff --git a/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot b/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot
index d7e19da6f202f95c0f347943316bd79e476d01bd..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}
@@ -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