Fixing the tests related to conflict numbers

pmeunier

Dec 28, 2025, 8:28 PM

VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC

Dependencies

• [2] 55SCQOOH Fixing the tests
• [3] UAFZU2RY Fixing the tests
• [4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [5] I52XSRUH Massive cleanup, and simplification
• [6] 3M7WBE24 Re-adding anyhow in the tests of libpijul
• [7] YN63NUZO Sanakirja 1.0
• [8] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
• [9] GHO6DWPI Refactoring iterators

Change contents

• replacement in libpijul/src/tests/missing_context.rs at line 123
  [3.684]→[3.684:745](∅→∅)
  − Ok(&"a\n>>>>>>> 0\nx\ny\nz\n<<<<<<< 0\nf\n"[..])
  [3.684]

  [4.294642]
  + Ok(&"a\n>>>>>>> 1\nx\ny\nz\n<<<<<<< 1\nf\n"[..])
• replacement in libpijul/src/tests/missing_context.rs at line 128
  [3.786]→[3.786:841](∅→∅)
  − Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])
  [3.786]

  [4.294822]
  + Ok(&">>>>>>> 1\nx\ny\nz\n<<<<<<< 1\n"[..])
• replacement in libpijul/src/tests/missing_context.rs at line 179
  [3.933]→[3.933:1016](∅→∅)
  − Ok(&"a\n>>>>>>> 0\nx\n<<<<<<< 0\ny\n>>>>>>> 1\nz\n<<<<<<< 1\nf\n"[..])
  [3.933]

  [4.296269]
  + Ok(&"a\n>>>>>>> 1\nx\n<<<<<<< 1\ny\n>>>>>>> 2\nz\n<<<<<<< 2\nf\n"[..])
• replacement in libpijul/src/tests/missing_context.rs at line 184
  [3.1057]→[3.1057:1112](∅→∅)
  − Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])
  [3.1057]

  [4.296449]
  + Ok(&">>>>>>> 1\nx\ny\nz\n<<<<<<< 1\n"[..])
• replacement in libpijul/src/tests/conflict.rs at line 776
  [4.379289]→[4.379289:379318](∅→∅)
  − // Bob edits and records
  [4.379289]

  [2.7051]
  + // Bob inserts xy between a and b
• replacement in libpijul/src/tests/conflict.rs at line 783
  [4.379676]→[4.379676:379707](∅→∅)
  − // Alice edits and records
  [4.379676]

  [2.7154]
  + // Alice inserts xy between a and b (same as Bob)
• edit in libpijul/src/tests/conflict.rs at line 789
  [4.58334]

  [4.379952]
  +

  + crate::pristine::debug(

  + &*txn.read(),

  + &*channel_alice.read(),

  + std::fs::File::create("alice0.dot").unwrap(),

  + )?;
• edit in libpijul/src/tests/conflict.rs at line 798
  [4.58405]

  [4.380060]
  + crate::pristine::debug(

  + &*txn.read(),

  + &*channel_alice.read(),

  + std::fs::File::create("alice1.dot").unwrap(),

  + )?;
• edit in libpijul/src/tests/conflict.rs at line 820
  [4.58490]

  [2.7259]
  + // Delete b and x, insert pre/post before/after conflict

  + // markers (except the closing marker).
• edit in libpijul/src/tests/conflict.rs at line 834
  [4.380818]

  [4.380882]
  + debug!("{}", std::str::from_utf8(&buf).unwrap());
• edit in libpijul/src/tests/conflict.rs at line 838
  [4.58629]

  [4.380996]
  +

  + crate::pristine::debug(

  + &*txn.read(),

  + &*channel_alice.read(),

  + std::fs::File::create("alice2.dot").unwrap(),

  + )?;

  + crate::pristine::debug(

  + &*txn.read(),

  + &*channel_bob.read(),

  + std::fs::File::create("bob.dot").unwrap(),

  + )?;

  +
• replacement in libpijul/src/tests/conflict.rs at line 1248
  [3.3354]→[3.3354:3421](∅→∅)
  − assert_eq!(conflict, vec![">>>>>>> 0", "x", "<<<<<<< 0"]);
  [3.3354]

  [4.393558]
  + assert_eq!(conflict, vec![">>>>>>> 1", "x", "<<<<<<< 1"]);
• replacement in libpijul/src/tests/conflict.rs at line 1790
  [3.5057]→[3.5057:5134](∅→∅)
  − assert_eq!(std::str::from_utf8(&buf_), Ok(">>>>>>> 0\nx\n<<<<<<< 0\n"));
  [3.5057]

  [4.409910]
  + assert_eq!(std::str::from_utf8(&buf_), Ok(">>>>>>> 1\nx\n<<<<<<< 1\n"));
• replacement in libpijul/src/tests/conflict.rs at line 1830
  [3.5184]→[3.5184:5262](∅→∅)
  − assert_eq!(std::str::from_utf8(&buf2_), Ok(">>>>>>> 0\nx\n<<<<<<< 0\n"));
  [3.5184]

  [4.67977]
  + assert_eq!(std::str::from_utf8(&buf2_), Ok(">>>>>>> 1\nx\n<<<<<<< 1\n"));
• replacement in libpijul/src/tests/conflict.rs at line 1924
  [3.5412]→[3.5412:5458](∅→∅)
  − Ok(">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n")
  [3.5412]

  [4.414149]
  + Ok(">>>>>>> 1\nx\ny\nz\n<<<<<<< 1\n")