hil: ota: add test for observation after restart

Test that the firmware update observation is reestablished after a client restart. Signed-off-by: Mike Szczys <[email protected]>
golioth · May 31, 2024 · 70e89f7 · 70e89f7
1 parent 6b40c73
commit 70e89f7
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 2 deletions.
diff --git a/tests/hil/platform/zephyr/boards/nrf52840dk_nrf52840.conf b/tests/hil/platform/zephyr/boards/nrf52840dk_nrf52840.conf
@@ -5,4 +5,4 @@ CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
 CONFIG_NET_L2_WIFI_SHELL=y
 CONFIG_GOLIOTH_SAMPLE_WIFI=y
 
-CONFIG_NET_PKT_TX_COUNT=8
+CONFIG_NET_PKT_TX_COUNT=12
diff --git a/tests/hil/tests/ota/test.c b/tests/hil/tests/ota/test.c
@@ -16,6 +16,9 @@ LOG_TAG_DEFINE(test_ota);
 static golioth_sys_sem_t connected_sem;
 static golioth_sys_sem_t reason_test_sem;
 static golioth_sys_sem_t block_test_sem;
+static golioth_sys_sem_t restart_test_sem;
+static golioth_sys_sem_t restart_test_begin_sem;
+static golioth_sys_sem_t restart_pending_sem;
 
 #define GOLIOTH_OTA_REASON_CNT 10
 #define GOLIOTH_OTA_STATE_CNT 4
@@ -24,6 +27,7 @@ static golioth_sys_sem_t block_test_sem;
 #define DUMMY_VER_SAME "1.2.3"
 #define DUMMY_VER_UPDATE "1.2.4"
 #define DUMMY_VER_EXTRA "1.2.5"
+#define DUMMY_VER_RESTART "1.2.6"
 
 static uint8_t callback_arg = 17;
 static uint8_t block_buf[GOLIOTH_OTA_BLOCKSIZE];
@@ -168,6 +172,24 @@ static void test_block_ops(void)
     }
 }
 
+static void test_restart(void)
+{
+
+    if (golioth_sys_sem_take(restart_test_begin_sem, 0))
+    {
+        golioth_client_stop(client);
+        golioth_sys_msleep(3000);
+        GLTH_LOGI(TAG, "Restarting Client");
+        golioth_sys_sem_give(restart_pending_sem);
+        golioth_client_start(client);
+    }
+    else if (golioth_sys_sem_take(restart_pending_sem, 0))
+    {
+        GLTH_LOGI(TAG, "Restart successful");
+        golioth_sys_sem_give(restart_test_begin_sem);
+    }
+}
+
 static void on_manifest(struct golioth_client *client,
                         const struct golioth_response *response,
                         const char *path,
@@ -225,6 +247,10 @@ static void on_manifest(struct golioth_client *client,
         {
             golioth_sys_sem_give(reason_test_sem);
         }
+        else if (strcmp(main->version, DUMMY_VER_RESTART) == 0)
+        {
+            golioth_sys_sem_give(restart_test_sem);
+        }
     }
 }
 
@@ -243,6 +269,9 @@ void hil_test_entry(const struct golioth_client_config *config)
     connected_sem = golioth_sys_sem_create(1, 0);
     reason_test_sem = golioth_sys_sem_create(1, 0);
     block_test_sem = golioth_sys_sem_create(1, 0);
+    restart_test_sem = golioth_sys_sem_create(1, 0);
+    restart_test_begin_sem = golioth_sys_sem_create(1, 1);
+    restart_pending_sem = golioth_sys_sem_create(1, 0);
 
     golioth_debug_set_cloud_log_enabled(false);
 
@@ -263,6 +292,10 @@ void hil_test_entry(const struct golioth_client_config *config)
         {
             test_block_ops();
         }
+        if (golioth_sys_sem_take(restart_test_sem, 0))
+        {
+            test_restart();
+        }
 
         golioth_sys_msleep(100);
     }

diff --git a/tests/hil/tests/ota/test_ota.py b/tests/hil/tests/ota/test_ota.py
@@ -7,6 +7,7 @@
 DUMMY_VER_SAME = '1.2.3'
 DUMMY_VER_UPDATE = '1.2.4'
 DUMMY_VER_EXTRA = '1.2.5'
+DUMMY_VER_RESTART = '1.2.6'
 MULTI_PACKAGE = 'walrus'
 MULTI_PACKAGE_VER = '0.4.2'
 
@@ -82,8 +83,10 @@ async def artifacts(project):
                 artifacts["test_multiple"] = a
             elif a.version == MULTI_PACKAGE_VER and a.package == MULTI_PACKAGE:
                 artifacts["multi_artifact"] = a
+            elif a.version == DUMMY_VER_RESTART and a.package == UPDATE_PACKAGE:
+                artifacts["test_restart"] = a
 
-    assert len(artifacts) == 5
+    assert len(artifacts) == 6
 
     return artifacts
 
@@ -95,6 +98,7 @@ async def releases(project, artifacts, tag):
     releases["test_multiple"] = await project.releases.create([artifacts["test_multiple"].id, artifacts["multi_artifact"].id], [], [tag.id], False)
     releases["test_blocks"] = await project.releases.create([artifacts["test_blocks"].id], [], [tag.id], False)
     releases["test_reasons"] = await project.releases.create([artifacts["test_reasons"].id], [], [tag.id], False)
+    releases["test_restart"] = await project.releases.create([artifacts["test_restart"].id], [], [tag.id], False)
     yield releases
 
     # Clean Up
@@ -157,6 +161,14 @@ async def test_multiple_artifacts(artifacts, board, project, releases):
 
     verify_component_values(board, artifacts["multi_artifact"].info)
 
+async def test_restart(artifacts, board, project, releases):
+    await project.releases.rollout_set(releases["test_restart"].id, True)
+
+    assert None != board.wait_for_regex_in_line('Found main component', timeout_s=30)
+    assert None != board.wait_for_regex_in_line('Ending session', timeout_s=10)
+    assert None != board.wait_for_regex_in_line('Found main component', timeout_s=60)
+    assert None != board.wait_for_regex_in_line('Restart successful', timeout_s=2)
+
 async def test_block_operations(board, project, releases):
     await project.releases.rollout_set(releases["test_blocks"].id, True)
     assert None != board.wait_for_regex_in_line(f"golioth_ota_size_to_nblocks: {TEST_BLOCK_CNT + 1}", timeout_s=12)