Merge pull request #2374 from reubenmiller/fix-pr-2640-merge-error

fix placement of assertions due to a git merging error

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

@@ -156,6 +156,19 @@ Thin-edge device supports sending inventory data via tedge topic to root fragmen
     Should Be Equal    ${mo["subtype"]}    LinuxDeviceA
     Should Be Equal    ${mo["type"]}    thin-edge.io
     Should Be Equal    ${mo["name"]}    ${DEVICE_SN}
+
+    # Validate clearing of fragments
+    Execute Command    tedge mqtt pub --retain "te/device/main///twin/subtype" ''
+    Managed Object Should Not Have Fragments    subtype
+
+    # Validate `name` and `type` can't be cleared
+    Execute Command    tedge mqtt pub --retain "te/device/main///twin/type" ''
+    Execute Command    tedge mqtt pub --retain "te/device/main///twin/name" ''
+    Sleep     5s    reason=Wait a minimum period before checking that the fragment has not changed (as it was previously set)
+    ${mo}=    Device Should Have Fragments    type
+    Should Be Equal    ${mo["type"]}    thin-edge.io
+    Should Be Equal    ${mo["name"]}    ${DEVICE_SN}
+
 #
 # Services
 #
@@ -220,17 +233,6 @@ Send events to a registered service
     Execute Command    tedge mqtt pub te/device/main/service/app6/e/event_002 '{"text": "test event"}'
     Device Should Have Event/s    expected_text=test event    type=event_002    minimum=1    maximum=1
 
-    # Validate clearing of fragments
-    Execute Command    tedge mqtt pub --retain "te/device/main///twin/subtype" ''
-    Managed Object Should Not Have Fragments    subtype
-
-    # Validate `name` and `type` can't be cleared
-    Execute Command    tedge mqtt pub --retain "te/device/main///twin/type" ''
-    Execute Command    tedge mqtt pub --retain "te/device/main///twin/name" ''
-    ${mo}=    Device Should Have Fragments    type
-    Should Be Equal    ${mo["type"]}    thin-edge.io
-    Should Be Equal    ${mo["name"]}    ${DEVICE_SN}
-
 *** Keywords ***
 
 Custom Setup