modules: main: Remove workaround delay for nRF Cloud delta clearing

The 5-second delay that ensured nRF Cloud cleared deltas before
provisioning requests is not nessecary anymore, as the issue is
no longer reproducible. Will be addressed if the issue resurfaces.

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

app/src/main.c

@@ -868,12 +868,6 @@ static void handle_cloud_shadow_response(struct main_state *state_object,
 	if (msg->type == CLOUD_SHADOW_RESPONSE_DELTA) {
 		/* Clear the shadow delta by reporting back the command to the cloud. */
 		update_shadow_reported_section(&config, command_type, command_id);
-		/* Workaround: Add a 5-second delay to ensure that nRF Cloud clears the
-		 * delta internally before executing the command. If the command is a
-		 * provisioning request, the device will disconnect from the cloud. If this
-		 * happens too quickly, nRF Cloud may not clear the delta properly.
-		 */
-		k_sleep(K_SECONDS(5));
 		command_execute(command_type);
 	} else {
 		/* For desired responses (initial shadow poll), only report config without

tests/on_target/tests/test_provisioning/test_provisioning.py

@@ -144,6 +144,30 @@ def _wait_for_provisioning_completion_and_cloud_connection(
 
     logger.info("Device provisioned and connected to nRF Cloud.")
 
+def _verify_no_shadow_delta(dut_cloud, timeout: int = 120):
+    """
+    Verifies that there is no shadow delta for the device in nRF Cloud.
+    This indicates that the device has processed all commands and reported back its state.
+    """
+    logger.info("Verifying that there is no shadow delta for the device...")
+
+    start = time.time()
+    while time.time() - start < timeout:
+        time.sleep(5)
+        try:
+            device = dut_cloud.cloud.get_device(dut_cloud.device_id)
+            device_state = device["state"]
+            if "delta" not in device_state or not device_state["delta"]:
+                logger.info("No shadow delta found for the device.")
+                return
+            else:
+                logger.debug("Shadow delta still present, waiting...")
+        except Exception as e:
+            logger.warning(f"Error retrieving device state from cloud: {e}")
+
+    raise RuntimeError(
+        f"Shadow delta still present for device after {timeout} seconds"
+    )
 
 def _verify_device_config_reported_to_cloud(dut_cloud, timeout: int = 180):
     """
@@ -274,6 +298,10 @@ def _run_reprovisioning(dut_cloud):
     # Wait for the device to process the command, reprovision, and reconnect
     _wait_for_provisioning_completion_and_cloud_connection(dut_cloud, timeout=300)
     _verify_device_config_reported_to_cloud(dut_cloud)
+    # Ensure no shadow delta remains after reprovisioning. This means that the device has receieved
+    # and processed the reprovisioning command successfully. AND reported back the command
+    # to the shadow reported section, clearing the delta.
+    _verify_no_shadow_delta(dut_cloud)
 
     logger.info(
         "--- Phase 2: Reprovisioning with New Credentials Completed Successfully ---"