Merge pull request #3852 from reubenmiller/test-refactor-system-tests

test: refactor system tests in preparation for mqtt service support

Author: reubenmiller

tests/RobotFramework/requirements/requirements.txt

@@ -1,7 +1,7 @@
 paho-mqtt~=1.6.1
 python-dotenv~=1.0.0
 robotframework~=7.0.0
-robotframework-c8y @ git+https://github.com/thin-edge/robotframework-c8y.git@0.47.0
+robotframework-c8y @ git+https://github.com/thin-edge/robotframework-c8y.git@0.49.0
 robotframework-aws @ git+https://github.com/thin-edge/[email protected]
 robotframework-debuglibrary~=2.5.0
 robotframework-jsonlibrary~=0.5

tests/RobotFramework/tests/cumulocity/firmware/firmware_operation_child_device.robot

@@ -120,7 +120,8 @@ Upload binary to Cumulocity
 Create c8y_Firmware operation
     ${operation}=    Cumulocity.Install Firmware    firmware1    1.0    ${file_url}
     Set Suite Variable    $operation
-    Cumulocity.Operation Should Be DELIVERED    ${operation}
+    Set Device Context    ${PARENT_SN}
+    Should Have MQTT Messages    c8y/devicecontrol/notifications    message_contains=${operation.id}
 
 Validate if file is not newly downloaded
     Set Device Context    ${PARENT_SN}

tests/RobotFramework/tests/cumulocity/telemetry/thin-edge_device_telemetry.robot

@@ -109,8 +109,7 @@ Measurement units can be cleared
     ...    type=t6
     ...    value=temperature
     ...    series=temperature
-    ...    reverse=${True}
-    ...    after=1970-01-01
+    ...    sort_newest=${True}
     Should Be Equal    ${measurements[0]["temperature"]["temperature"]["unit"]}    °C
     # Execute Command    sleep 1
     Execute Command    tedge mqtt pub -r te/device/main///m/t6/meta ''
@@ -122,8 +121,7 @@ Measurement units can be cleared
     ...    type=t6
     ...    value=temperature
     ...    series=temperature
-    ...    after=1970-01-01
-    ...    reverse=${True}
+    ...    sort_newest=${True}
     Log    ${measurements}
     Should Not Contain    ${measurements[0]["temperature"]["temperature"]}    unit
 

tests/RobotFramework/tests/customizing/data_path_config.robot

@@ -59,7 +59,8 @@ Create c8y_Firmware operation
     [Arguments]    ${firmware_url}
     ${operation}=    Cumulocity.Install Firmware    firmware1    1.0    ${firmware_url}
     Set Suite Variable    $operation
-    Cumulocity.Operation Should Be DELIVERED    ${operation}
+    Set Device Context    ${PARENT_SN}
+    Should Have MQTT Messages    c8y/devicecontrol/notifications    message_contains=${operation.id}
 
 Validate tedge firmware update request sent
     [Arguments]    ${date_from}

tests/RobotFramework/tests/pkcs11/private_key_storage.robot

@@ -206,24 +206,47 @@ tedge cert create-key-hsm should ask where to create keypair if multiple tokens
 
     # unset key_uri so there there's no hint where to generate the keypair
     Execute Command    cmd=tedge config unset device.key_uri
-    ${stderr}=    Execute Command    cmd=tedge cert create-key-hsm --type ecdsa --label my-key    strip=True    stdout=False    stderr=True    exp_exit_code=1
+    ${stderr}=    Execute Command
+    ...    cmd=tedge cert create-key-hsm --type ecdsa --label my-key
+    ...    strip=True
+    ...    stdout=False
+    ...    stderr=True
+    ...    exp_exit_code=1
     Should Contain    ${stderr}    No token URL was provided for this operation; the available tokens are:
     Should Contain    ${stderr}    token=create-key-token1
     Should Contain    ${stderr}    token=create-key-token2
 
 tedge cert create-key-hsm can set chosen id and returns error if object with this id already exists
-    ${output}=    Execute Command    cmd=tedge cert create-key-hsm --type ecdsa --label my-key --id 010203 "pkcs11:token=tedge"    strip=True    stdout=False    stderr=True
+    ${output}=    Execute Command
+    ...    cmd=tedge cert create-key-hsm --type ecdsa --label my-key --id 010203 "pkcs11:token=tedge"
+    ...    strip=True
+    ...    stdout=False
+    ...    stderr=True
     Should Contain    ${output}    id=%01%02%03
 
-    ${output}=    Execute Command    cmd=tedge cert create-key-hsm --type ecdsa --label my-key --id 010203 "pkcs11:token=tedge"    strip=True    stdout=False    stderr=True    exp_exit_code=!0
+    ${output}=    Execute Command
+    ...    cmd=tedge cert create-key-hsm --type ecdsa --label my-key --id 010203 "pkcs11:token=tedge"
+    ...    strip=True
+    ...    stdout=False
+    ...    stderr=True
+    ...    exp_exit_code=!0
     Should Contain    ${output}    Object with this id already exists on the token
 
 tedge cert create-key-hsm can set pin per request
-    ${output}=    Execute Command    cmd=tedge cert create-key-hsm --label my-key --pin 000000 "pkcs11:token=tedge"    strip=True    stdout=False    stderr=True    exp_exit_code=!0
+    ${output}=    Execute Command
+    ...    cmd=tedge cert create-key-hsm --label my-key --pin 000000 "pkcs11:token=tedge"
+    ...    strip=True
+    ...    stdout=False
+    ...    stderr=True
+    ...    exp_exit_code=!0
     Should Contain    ${output}    The specified PIN is incorrect
 
 tedge cert create-key-hsm can save public key to file
-    ${output}=    Execute Command    cmd=tedge cert create-key-hsm --label my-key --outfile-pubkey pubkey.pem "pkcs11:token=tedge"    strip=True    stdout=False    stderr=True
+    ${output}=    Execute Command
+    ...    cmd=tedge cert create-key-hsm --label my-key --outfile-pubkey pubkey.pem "pkcs11:token=tedge"
+    ...    strip=True
+    ...    stdout=False
+    ...    stderr=True
     ${pubkey}=    Execute Command    cat pubkey.pem    strip=True
     Should Contain    ${output}    ${pubkey}