diff --git a/crates/notebook/tests/session.rs b/crates/notebook/tests/session.rs index 316d3c3ecee86f7e25c2ef602294897208f235e8..46da7c75f7d164db1e77c26badd724ff74e657aa 100644 --- a/crates/notebook/tests/session.rs +++ b/crates/notebook/tests/session.rs @@ -837,27 +837,16 @@ fn an_uncertain_attempt_is_released_after_restart_by_review() { let mut faulty = server::Server::new(&source); faulty.fault = server::Fault::UnknownBefore; assert!(replica.sync_once(&mut faulty).is_err()); + let attempted = replica.status(id).unwrap(); assert!(matches!( - replica.status(id).unwrap(), + attempted, Some(EditStatus::AwaitingConfirmation { .. }) )); drop(replica); - let notified = Arc::new(AtomicUsize::new(0)); - let counter = Arc::clone(¬ified); - let section = Section::resume( - &file, - notebook::Replica::open(&cache).unwrap(), - false, - move || { - counter.fetch_add(1, Ordering::SeqCst); - }, - ) - .unwrap(); - wait( - §ion, - |event| matches!(event, Event::Attempt { id: n, status: EditStatus::AwaitingConfirmation { .. } } if *n == id), - ); + let section = + Section::resume(&file, notebook::Replica::open(&cache).unwrap(), true, || {}).unwrap(); + assert_eq!(section.status(id).unwrap(), attempted); assert_eq!( section .pending() @@ -872,6 +861,7 @@ fn an_uncertain_attempt_is_released_after_restart_by_review() { if continued { section.release(id, &archive, Resolution::Mine).unwrap(); assert_eq!(section.status(id).unwrap(), Some(EditStatus::Pending)); + section.set_offline(false); published(§ion, id); assert_same(stored_page(&file, space), &local); } else { @@ -887,10 +877,7 @@ fn an_uncertain_attempt_is_released_after_restart_by_review() { } let recovery = Recovery::open(&archive).unwrap(); assert_eq!(recovery.pending().unwrap().len(), 1); - assert!(matches!( - recovery.status(id).unwrap(), - Some(EditStatus::AwaitingConfirmation { .. }) - )); + assert_eq!(recovery.status(id).unwrap(), attempted); assert!(section.pending().unwrap().is_empty()); assert!( section