| ... | ... | @@ -837,27 +837,16 @@ fn an_uncertain_attempt_is_released_after_restart_by_review() { |
| 837 | 837 | let mut faulty = server::Server::new(&source); |
| 838 | 838 | faulty.fault = server::Fault::UnknownBefore; |
| 839 | 839 | assert!(replica.sync_once(&mut faulty).is_err()); |
| 840 | let attempted = replica.status(id).unwrap(); |
| 840 | 841 | assert!(matches!( |
| 841 | | replica.status(id).unwrap(), |
| 842 | attempted, |
| 842 | 843 | Some(EditStatus::AwaitingConfirmation { .. }) |
| 843 | 844 | )); |
| 844 | 845 | drop(replica); |
| 845 | 846 | |
| 846 | | let notified = Arc::new(AtomicUsize::new(0)); |
| 847 | | let counter = Arc::clone(¬ified); |
| 848 | | let section = Section::resume( |
| 849 | | &file, |
| 850 | | notebook::Replica::open(&cache).unwrap(), |
| 851 | | false, |
| 852 | | move || { |
| 853 | | counter.fetch_add(1, Ordering::SeqCst); |
| 854 | | }, |
| 855 | | ) |
| 856 | | .unwrap(); |
| 857 | | wait( |
| 858 | | §ion, |
| 859 | | |event| matches!(event, Event::Attempt { id: n, status: EditStatus::AwaitingConfirmation { .. } } if *n == id), |
| 860 | | ); |
| 847 | let section = |
| 848 | Section::resume(&file, notebook::Replica::open(&cache).unwrap(), true, || {}).unwrap(); |
| 849 | assert_eq!(section.status(id).unwrap(), attempted); |
| 861 | 850 | assert_eq!( |
| 862 | 851 | section |
| 863 | 852 | .pending() |
| ... | ... | @@ -872,6 +861,7 @@ fn an_uncertain_attempt_is_released_after_restart_by_review() { |
| 872 | 861 | if continued { |
| 873 | 862 | section.release(id, &archive, Resolution::Mine).unwrap(); |
| 874 | 863 | assert_eq!(section.status(id).unwrap(), Some(EditStatus::Pending)); |
| 864 | section.set_offline(false); |
| 875 | 865 | published(§ion, id); |
| 876 | 866 | assert_same(stored_page(&file, space), &local); |
| 877 | 867 | } else { |
| ... | ... | @@ -887,10 +877,7 @@ fn an_uncertain_attempt_is_released_after_restart_by_review() { |
| 887 | 877 | } |
| 888 | 878 | let recovery = Recovery::open(&archive).unwrap(); |
| 889 | 879 | assert_eq!(recovery.pending().unwrap().len(), 1); |
| 890 | | assert!(matches!( |
| 891 | | recovery.status(id).unwrap(), |
| 892 | | Some(EditStatus::AwaitingConfirmation { .. }) |
| 893 | | )); |
| 880 | assert_eq!(recovery.status(id).unwrap(), attempted); |
| 894 | 881 | assert!(section.pending().unwrap().is_empty()); |
| 895 | 882 | assert!( |
| 896 | 883 | section |
clover caruso <git@paperclover.net> 2026-10-11 22:41:04-07:00