improve reliability of hang monitor tests

2 files changed, 26 insertions, 18 deletions

diff --git a/components/background_hang_monitor/background_hang_monitor.rs b/components/background_hang_monitor/background_hang_monitor.rs
index bc736402521..b97ec3bceec 100644
--- a/components/background_hang_monitor/background_hang_monitor.rs
+++ b/components/background_hang_monitor/background_hang_monitor.rs
@@ -33,17 +33,19 @@ impl HangMonitorRegister {
         monitoring_enabled: bool,
     ) -> Box<dyn BackgroundHangMonitorRegister> {
         let (sender, port) = unbounded();
-        let _ = thread::Builder::new().spawn(move || {
-            let mut monitor = BackgroundHangMonitorWorker::new(
-                constellation_chan,
-                control_port,
-                port,
-                monitoring_enabled,
-            );
-            while monitor.run() {
-                // Monitoring until all senders have been dropped...
-            }
-        });
+        let _ = thread::Builder::new()
+            .spawn(move || {
+                let mut monitor = BackgroundHangMonitorWorker::new(
+                    constellation_chan,
+                    control_port,
+                    port,
+                    monitoring_enabled,
+                );
+                while monitor.run() {
+                    // Monitoring until all senders have been dropped...
+                }
+            })
+            .expect("Couldn't start BHM worker.");
         Box::new(HangMonitorRegister {
             sender,
             monitoring_enabled,
diff --git a/components/background_hang_monitor/tests/hang_monitor_tests.rs b/components/background_hang_monitor/tests/hang_monitor_tests.rs
index f379585b5e2..2dade559f84 100644
--- a/components/background_hang_monitor/tests/hang_monitor_tests.rs
+++ b/components/background_hang_monitor/tests/hang_monitor_tests.rs
@@ -197,12 +197,18 @@ fn test_hang_monitoring_exit_signal() {
     );
 
     let (exit_sender, exit_receiver) = ipc::channel().expect("Failed to create IPC channel!");
-    // Send the exit message.
-    let _ = control_sender.send(BackgroundHangMonitorControlMsg::Exit(exit_sender));
-
-    // Assert we receive a confirmation back.
-    assert!(exit_receiver.recv().is_ok());
 
-    // Assert we get the exit signal.
-    while !closing.load(Ordering::SeqCst) {}
+    // Send the exit message.
+    if control_sender
+        .send(BackgroundHangMonitorControlMsg::Exit(exit_sender))
+        .is_ok()
+    {
+        // Assert we receive a confirmation back.
+        assert!(exit_receiver.recv().is_ok());
+
+        // Assert we get the exit signal.
+        while !closing.load(Ordering::SeqCst) {
+            thread::sleep(Duration::from_millis(10));
+        }
+    }
 }