Skip to content

Commit 3d8ed22

Browse files
f split consistency lock + swallow panic output
1 parent e72996f commit 3d8ed22

File tree

2 files changed

+60
-56
lines changed

2 files changed

+60
-56
lines changed

background-processor/src/lib.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,17 +314,19 @@ mod tests {
314314
Err(std::io::Error::new(std::io::ErrorKind::Other, "test"))
315315
}
316316

317+
std::panic::set_hook(Box::new(|panic_info| {
318+
if let Some(s) = panic_info.payload().downcast_ref::<String>() {
319+
assert_eq!(s, "Errored persisting manager: test");
320+
} else {
321+
panic!("Expected string panic");
322+
}
323+
}));
324+
317325
let nodes = create_nodes(2, "test_persist_error".to_string());
318326
let bg_processor = BackgroundProcessor::start(persist_manager, nodes[0].node.clone(), nodes[0].logger.clone());
319327
open_channel!(nodes[0], nodes[1], 100000);
320328

321-
match bg_processor.thread_handle.join() {
322-
Err(e) => {
323-
let error = e.downcast_ref::<String>().unwrap();
324-
assert_eq!("Errored persisting manager: test", error);
325-
}
326-
_ => panic!("Unexpected result")
327-
}
329+
let _ = bg_processor.thread_handle.join().expect_err("Errored persisting manager: test");
328330
}
329331

330332
#[test]

0 commit comments

Comments
 (0)