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
Library RequestsLibrary
Library SSHLibrary
Library XML
Library RequestsLibrary
Library SSHLibrary
Library XML
-Variables ../../../variables/Variables.py
-Resource ../../../libraries/Utils.robot
-Resource ../../../libraries/SetupUtils.robot
Resource ../../../libraries/RemoteBash.robot
Resource ../../../libraries/RemoteBash.robot
+Resource ../../../libraries/SetupUtils.robot
Resource ../../../libraries/SSHKeywords.robot
Resource ../../../libraries/SSHKeywords.robot
+Resource ../../../libraries/TemplatedRequests.robot
+Resource ../../../libraries/Utils.robot
+Variables ../../../variables/Variables.py
*** Variables ***
${ITEM_COUNT} ${10000}
*** Variables ***
${ITEM_COUNT} ${10000}
${rsp}= RequestsLibrary.Delete Request session ${carurl}
Should Be Equal As Numbers 200 ${rsp.status_code}
${rsp}= RequestsLibrary.Get Request session ${carurl}
${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}
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}
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
*** Keywords ***
Start Suite
Library RequestsLibrary
Library SSHLibrary
Library XML
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/RemoteBash.robot
+Resource ../../../libraries/SetupUtils.robot
Resource ../../../libraries/SSHKeywords.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}
*** Variables ***
${ITEM_COUNT} ${10000}
${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}
${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}
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}
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
*** Keywords ***
Start Suite
Default Tags critical
Library RequestsLibrary
Library SSHLibrary
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/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}
*** Variables ***
${ITEM_COUNT} ${10000}
${rsp}= RequestsLibrary.Delete Request ${session} ${CARURL}
Should Be Equal As Numbers 200 ${rsp.status_code}
${rsp}= RequestsLibrary.Get Request ${session} ${CARURL}
${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
*** Keywords ***
Start Suite