Add a timeout to the remote-test-client connection

src/tools/remote-test-client/src/main.rs

@@ -17,6 +17,9 @@ use std::{env, thread};
 const REMOTE_ADDR_ENV: &str = "TEST_DEVICE_ADDR";
 const DEFAULT_ADDR: &str = "127.0.0.1:12345";
 
+const CONNECT_TIMEOUT_ENV: &str = "TEST_DEVICE_CONNECT_TIMEOUT_SECONDS";
+const DEFAULT_CONNECT_TIMEOUT: Duration = Duration::from_mins(30);
+
 macro_rules! t {
     ($e:expr) => {
         match $e {
@@ -69,19 +72,38 @@ fn spawn_emulator(target: &str, server: &Path, tmpdir: &Path, rootfs: Option<Pat
     }
 
     // Wait for the emulator to come online
-    loop {
+    let mut total_dur = Duration::from_secs(0);
+    let timeout = env::var(CONNECT_TIMEOUT_ENV).ok().map_or(DEFAULT_CONNECT_TIMEOUT, |timeout| {
+        let seconds = timeout.parse::<u64>().unwrap_or_else(|_| {
+            panic!("The {CONNECT_TIMEOUT_ENV} env variable is not a valid integer");
+        });
+        Duration::from_secs(seconds)
+    });
+
+    let mut timed_out = true;
+
+    while total_dur < timeout {
         let dur = Duration::from_millis(2000);
         if let Ok(mut client) = TcpStream::connect(&device_address) {
             t!(client.set_read_timeout(Some(dur)));
             t!(client.set_write_timeout(Some(dur)));
             if client.write_all(b"ping").is_ok() {
                 let mut b = [0; 4];
                 if client.read_exact(&mut b).is_ok() {
+                    timed_out = false;
                     break;
                 }
             }
         }
         thread::sleep(dur);
+        total_dur += dur;
+    }
+
+    if timed_out {
+        panic!(
+            "Gave up trying to connect to test device at {device_address} after {} seconds",
+            total_dur.as_secs()
+        );
     }
 }