tests: Fix flaky hotplug/async_fuzz cascade on macos-14

Shared mock channel buffers were never flushed between test suites, so
stale bytes left in flight at teardown caused the next suite's fresh PD
to read a non-zero sequence on the first packet, forcing the CP offline
for 300s.

This patch calls flush cp_to_pd_buf and pd_to_cp_buf at setup. Also fix
the hotplug setup-failure paths that leaked async runners into
async_fuzz, and replace two hardcoded 2s command waits in async_fuzz
with condition polls.

Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>

Author: sidcha

tests/unit-tests/test-async-fuzz.c

@@ -51,6 +51,16 @@ static int async_command_callback(void *data, struct osdp_cmd *cmd)
 /* Declare external variables from test.c */
 extern work_t *g_test_works[];
 
+static bool wait_for_cmd_received(struct async_test_data *data, int timeout_sec)
+{
+	for (int i = 0; i < timeout_sec * 10; i++) {
+		if (data->cmd_received)
+			return true;
+		usleep(100 * 1000);
+	}
+	return false;
+}
+
 /* Helper function to wait for all work slots to be freed */
 static void wait_for_all_work_cleanup(void)
 {
@@ -179,11 +189,7 @@ static bool test_async_startup_order(enum async_order order)
 		goto cleanup;
 	}
 
-	/* Wait for command processing */
-	usleep(2000 * 1000); /* 2 seconds */
-
-	/* Check result */
-	if (data.cmd_received) {
+	if (wait_for_cmd_received(&data, 5)) {
 		printf(SUB_2 "Order %d: SUCCESS\n", order);
 		result = true;
 	} else {
@@ -288,11 +294,7 @@ static bool test_async_recovery(void)
 		goto cleanup;
 	}
 
-	/* Wait for command processing */
-	usleep(2000 * 1000); /* 2 seconds */
-
-	/* Check result */
-	if (data.cmd_received) {
+	if (wait_for_cmd_received(&data, 5)) {
 		printf(SUB_2 "Recovery: SUCCESS\n");
 		result = true;
 	} else {

tests/unit-tests/test-hotplug.c

@@ -31,6 +31,8 @@ struct test_hotplug_ctx {
 
 static struct test_hotplug_ctx g_test_ctx = {0};
 
+static bool wait_for_pd_online(int timeout_sec);
+
 int test_hotplug_event_callback(void *arg, int pd, struct osdp_event *ev)
 {
 	ARG_UNUSED(pd);
@@ -69,22 +71,24 @@ static int setup_test_environment(struct test *t)
 
 	if (g_test_ctx.cp_runner < 0 || g_test_ctx.pd_runner < 0) {
 		printf(SUB_1 "Failed to created CP/PD runners\n");
+		if (g_test_ctx.cp_runner >= 0)
+			async_runner_stop(g_test_ctx.cp_runner);
+		if (g_test_ctx.pd_runner >= 0)
+			async_runner_stop(g_test_ctx.pd_runner);
+		osdp_cp_teardown(g_test_ctx.cp_ctx);
+		osdp_pd_teardown(g_test_ctx.pd_ctx);
+		memset(&g_test_ctx, 0, sizeof(g_test_ctx));
 		return -1;
 	}
 
-	/* Wait for devices to come online */
-	int rc = 0;
-	uint8_t status = 0;
-	while (1) {
-		if (rc > 10) {
-			printf(SUB_1 "PD failed to come online\n");
-			return -1;
-		}
-		osdp_get_status_mask(g_test_ctx.cp_ctx, &status);
-		if (status & 1)
-			break;
-		usleep(1000 * 1000);
-		rc++;
+	if (!wait_for_pd_online(10)) {
+		printf(SUB_1 "PD failed to come online\n");
+		async_runner_stop(g_test_ctx.cp_runner);
+		async_runner_stop(g_test_ctx.pd_runner);
+		osdp_cp_teardown(g_test_ctx.cp_ctx);
+		osdp_pd_teardown(g_test_ctx.pd_ctx);
+		memset(&g_test_ctx, 0, sizeof(g_test_ctx));
+		return -1;
 	}
 
 	return 0;

tests/unit-tests/test.c

@@ -617,6 +617,11 @@ int test_setup_devices_ext(struct test *t, osdp_t **cp, osdp_t **pd,
 	ARG_UNUSED(t);
 #endif /* OPT_OSDP_LOG_MINIMAL */
 
+	/* Shared mock channel; drop stale bytes left by the previous suite so a
+	 * fresh PD does not read a non-zero sequence on its first packet. */
+	CIRCBUF_FLUSH(cp_to_pd_buf);
+	CIRCBUF_FLUSH(pd_to_cp_buf);
+
 	uint8_t scbk[16] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f