From fe2d41a2b1dc79a42074c88ce951bb1d8bf72981 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Fri, 22 Dec 2023 15:49:43 +0000
Subject: [PATCH] wlan test: robustify, tail log on failure

---
 tests/wlan/wait-for-wlan.expect | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/wlan/wait-for-wlan.expect b/tests/wlan/wait-for-wlan.expect
index 7c74c09..1d42a4e 100644
--- a/tests/wlan/wait-for-wlan.expect
+++ b/tests/wlan/wait-for-wlan.expect
@@ -1,20 +1,30 @@
 set timeout 60
 
-spawn socat unix-connect:vm/console -
-send "\r\n"
-expect "#"
 set FINISHED 0
 set EXIT "1"
-send "ls -l /run/uncaught-logs/current\r\n"
+
+spawn socat unix-connect:vm/console -
+expect {
+  "BusyBox" { }
+  "#" { }
+}
+send "\r\n"
+expect {
+  "#"  { send "NOT=not_present\r" }
+}
 expect "#"
-while { $FINISHED < 20 } {
-  send "date && grep AP-ENABLED /run/uncaught-logs/current || echo not\r\n"
+while { $FINISHED < 10 } {
+  send "date && grep AP-ENABLED /run/uncaught-logs/* || echo \$NOT\r\n"
   
   expect {
-    "wlan0: AP-ENABLED" { set FINISHED 10; set EXIT 0; }
-    "not" { send_user "waiting ..." ; sleep 5 }
+    "wlan0: AP-ENABLED" { set FINISHED 999; set EXIT 0; }
+    "not_present" { send_user "waiting ...\n" ; sleep 5 }
   }
   set FINISHED [ expr $FINISHED + 1 ]
 }
 
+if { $EXIT > 0 } {
+  send "tail -40 /run/uncaught-logs/current\r\n"
+  expect "#"
+}
 exit $EXIT