Merge branch 'main' into P11c

crates/ledger-gui/tests/dock.rs

@@ -105,8 +105,10 @@ echo "fake-agent in $(basename "$(pwd)")"
 trap 'echo got-interrupt' INT
 trap 'echo "size $(stty size)"' WINCH
 echo ready
+# A whole second: macOS's /bin/bash is 3.2, whose `read -t` takes no
+# fraction (the portable job found it).
 while true; do
-  if read -r -t 0.1 line; then echo "you-said: $line"; fi
+  if read -r -t 1 line; then echo "you-said: $line"; fi
 done
 "#,
     )

crates/ledger-gui/tests/exports.rs

@@ -386,7 +386,12 @@ fn the_viewer_finds_its_book_in_the_root() {
         )
         .unwrap();
     }
-    let dir = |id: &str| root.book_dir(&ledger_store::root::BookId::parse(id).unwrap());
+    // As the system spells it: `book_in_root` answers a canonical path
+    // (macOS writes /tmp as /private/tmp).
+    let dir = |id: &str| {
+        std::fs::canonicalize(root.book_dir(&ledger_store::root::BookId::parse(id).unwrap()))
+            .unwrap()
+    };
     assert_eq!(
         ledger_gui::book_in_root(Some(&r), Some("zeta")).unwrap(),
         dir("zeta")