f have stop() join on the thread

Author: valentinewallace

background-processor/src/lib.rs

@@ -103,8 +103,9 @@ impl BackgroundProcessor {
 	}
 
 	/// Stop `BackgroundProcessor`'s thread.
-	pub fn stop(&self) {
-		self.stop_thread.store(true, Ordering::Release)
+	pub fn stop(self) -> Result<(), std::io::Error> {
+		self.stop_thread.store(true, Ordering::Release);
+		self.thread_handle.join().unwrap()
 	}
 }
 
@@ -277,8 +278,6 @@ mod tests {
 				break
 			}
 		}
-		processor.stop();
-		processor.thread_handle.join().unwrap();
 	}
 
 	#[test]
@@ -309,7 +308,7 @@ mod tests {
 		let bg_processor = BackgroundProcessor::start(persist_manager, nodes[0].node.clone(), nodes[0].logger.clone());
 		open_channel!(nodes[0], nodes[1], 100000);
 
-		let _ = bg_processor.thread_handle.join().expect_err("Errored persisting manager: test");
+		let _ = bg_processor.thread_handle.join().unwrap().expect_err("Errored persisting manager: test");
 	}
 
 	#[test]
@@ -321,12 +320,10 @@ mod tests {
 		let bg_processor = BackgroundProcessor::start(callback, nodes[0].node.clone(), nodes[0].logger.clone());
 
 		// Stop the background processor and check that it terminated.
-		bg_processor.stop();
-		loop {
-			let log_entries = nodes[0].logger.lines.lock().unwrap();
-			if log_entries.get(&("background_processor".to_string(), "Terminating background processor.".to_string())).is_some() {
-				break
-			}
+		assert!(bg_processor.stop().is_ok());
+		let log_entries = nodes[0].logger.lines.lock().unwrap();
+		if !log_entries.get(&("background_processor".to_string(), "Terminating background processor.".to_string())).is_some() {
+			panic!("Expected to log on stopping thread");
 		}
 	}
 }