Fixing tests

pmeunier

Jan 18, 2026, 6:19 PM

KIJOA3DKBYIPOTKB7OKJBONTW2NIHRGMQDKXXB2PEP3TEOS5LETQC

Dependencies

• [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [3] 3YDPHBAN address non-controversial clippy lints
• [4] GHO6DWPI Refactoring iterators
• [5] YN63NUZO Sanakirja 1.0
• [6] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
• [7] BC3QS46O Fix test compilation
• [8] CX2FTBQU Fixing compilation errors in
• [9] I52XSRUH Massive cleanup, and simplification
• [10] TIPZ7UXN Started fixing the tests for parallel record/output
• [11] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [12] 55SCQOOH Fixing the tests

Change contents

• replacement in libpijul/src/tests/unrecord.rs at line 271
  [2.258274]→[2.258274:258308](∅→∅)
  − if conflicts.len() != 1 {
  [2.258274]

  [2.258308]
  + // Here in txn we have h1, we added h2 and unrecorded h2. No conflict.

  + if !conflicts.is_empty() {
• edit in libpijul/src/tests/unrecord.rs at line 275
  [2.258369]→[7.0:49](∅→∅),[7.49]→[8.0:79](∅→∅),[8.79]→[2.258473:258528](∅→∅),[2.258473]→[2.258473:258528](∅→∅)
  − match conflicts.iter().next().unwrap() {

  − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "file"),

  − ref c => panic!("c = {:#?}", c),

  − }
• edit in libpijul/src/tests/unrecord.rs at line 301
  [2.259350]→[3.50:139](∅→∅)
  − // Should fail: we're resurrecting a file in a directory that doesn't

  − // exist any more.
• edit in libpijul/src/tests/unrecord.rs at line 334
  [2.260720]

  [2.260720]
  + /*

  + // We used to consider this a conflict, but now unrecording a file

  + // deletion also resurrects its hierarchy.
• edit in libpijul/src/tests/unrecord.rs at line 345
  [2.261004]

  [2.261004]
  + */
• edit in libpijul/src/tests/performance.rs at line 124
  [6.17548]

  [5.25112]
  +

  + {

  + let txn = txn.read();

  + let graph = &channel.read();

  + let mut f = std::fs::File::create("before0").unwrap();

  + crate::pristine::debug(&*txn, &txn.graph(&*graph), &mut f).unwrap();

  +

  + let graph = &channel2.read();

  + let mut f = std::fs::File::create("before1").unwrap();

  + crate::pristine::debug(&*txn, &txn.graph(&*graph), &mut f).unwrap();

  + }
• edit in libpijul/src/tests/performance.rs at line 153
  [4.6803]

  [2.282504]
  +

  + {

  + let txn = txn.read();

  + let mut f = std::fs::File::create("after0").unwrap();

  + crate::pristine::debug(&*txn, &txn.graph(&*graph), &mut f).unwrap();

  + }

  +