Fixing the tests

pmeunier

Jan 4, 2022, 12:31 PM

UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC

Dependencies

• [2] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
• [3] 55SCQOOH Fixing the tests
• [4] 6YMDOZIB Refactoring apply
• [5] WZVCLZKY address clippy lints
• [6] I52XSRUH Massive cleanup, and simplification
• [7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [8] 3M7WBE24 Re-adding anyhow in the tests of libpijul
• [9] I24UEJQL Various post-fire fixes
• [10] YN63NUZO Sanakirja 1.0
• [11] ZXTHL45O address clippy lints
• [12] SHSJ3Y53 Fixing more tests
• [13] TIPZ7UXN Started fixing the tests for parallel record/output
• [14] GHO6DWPI Refactoring iterators
• [15] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [16] OEKRRU6O Fix test compilation
• [17] BC3QS46O Fix test compilation
• [*] 7UPL3Y2A Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables

Change contents

• replacement in libpijul/src/tests/unrecord.rs at line 546
  [3.267896]→[3.267896:267973](∅→∅)
  − let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();
  [3.267896]

  [3.267973]
  +

  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  +

  + let mut conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();
• replacement in libpijul/src/tests/unrecord.rs at line 554
  [3.268028]→[3.268028:268263](∅→∅)
  − vec![

  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",

  − "================================",

  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

  − "a",

  − "b",

  − "x",

  − "y"

  − ]
  [3.268028]

  [3.268263]
  + vec!["<<<<<<< 1", "======= 1", ">>>>>>> 1", "a", "b", "x", "y"]
• edit in libpijul/src/tests/unrecord.rs at line 822
  [3.27769]

  [19.1794]
  + let (x, _) = inodes.next().unwrap().unwrap();

  + assert!(x.is_root());
• replacement in libpijul/src/tests/text.rs at line 32
  [3.1117]→[3.1117:1206](∅→∅)
  − vec!["+ French / Français (Windows CP 1252)", "+ €‚ƒ„…†‡, Salut"],
  [3.1117]

  [3.1206]
  + vec![

  + "+ French / Français (Windows CP 1252)",

  + "+ € abcde ‚ xys ƒ uvw „ !bla …... † XA>TH ‡, Salut"

  + ],
• replacement in libpijul/src/tests/performance.rs at line 53
  [3.6193]→[3.279923:279951](∅→∅),[3.27843]→[3.279923:279951](∅→∅),[3.279923]→[3.279923:279951](∅→∅)
  − let m0 = n * 8 + 6;
  [3.6193]

  [3.279951]
  + let m0 = n * 8 + 10;
• edit in libpijul/src/tests/missing_context.rs at line 110
  [3.294404]

  [3.294404]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);
• replacement in libpijul/src/tests/missing_context.rs at line 114
  [3.294449]→[3.294449:294504](∅→∅),[3.294504]→[2.22757:22860](∅→∅),[3.4360]→[3.294603:294642](∅→∅),[3.14575]→[3.294603:294642](∅→∅),[2.22860]→[3.294603:294642](∅→∅),[3.294603]→[3.294603:294642](∅→∅)
  − std::str::from_utf8(&buf),

  − Ok(

  − &"a\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\ny\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\nf\n"

  − [..]

  − )
  [3.294449]

  [3.294642]
  + std::str::from_utf8(&buf_),

  + Ok(&"a\n>>>>>>> 0\nx\ny\nz\n<<<<<<< 0\nf\n"[..])
• replacement in libpijul/src/tests/missing_context.rs at line 119
  [3.294686]→[3.294686:294725](∅→∅),[3.294725]→[2.22861:22992](∅→∅)
  − std::str::from_utf8(&buf),

  − Ok(

  − &">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\ny\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n"[..]

  − )
  [3.294686]

  [3.294822]
  + std::str::from_utf8(&buf_),

  + Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])
• edit in libpijul/src/tests/missing_context.rs at line 167
  [3.296056]

  [3.296056]
  + let buf_ = re.replace_all(&buf, &[][..]);
• replacement in libpijul/src/tests/missing_context.rs at line 169
  [3.296076]→[3.296076:296131](∅→∅),[3.296131]→[3.15220:15391](∅→∅),[3.15391]→[3.296230:296269](∅→∅),[3.296230]→[3.296230:296269](∅→∅)
  − std::str::from_utf8(&buf),

  − Ok(

  − &"a\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\ny\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\nf\n"

  − [..]

  − )
  [3.296076]

  [3.296269]
  + std::str::from_utf8(&buf_),

  + Ok(&"a\n>>>>>>> 0\nx\n<<<<<<< 0\ny\n>>>>>>> 1\nz\n<<<<<<< 1\nf\n"[..])
• replacement in libpijul/src/tests/missing_context.rs at line 174
  [3.296313]→[3.296313:296352](∅→∅),[3.296352]→[3.15392:15561](∅→∅)
  − std::str::from_utf8(&buf),

  − Ok(&">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\ny\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n"[..])
  [3.296313]

  [3.296449]
  + std::str::from_utf8(&buf_),

  + Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])
• edit in libpijul/src/tests/file_conflicts.rs at line 385
  [2.33076]

  [3.318182]
  +

  + {

  + let txn_ = txn_charlie.write();

  + let mut f = std::fs::File::create("/tmp/charlie0")?;

  + crate::pristine::debug(&*txn_, &txn_.graph(&*channel_charlie.read()), &mut f)?;

  + }
• edit in libpijul/src/tests/file_conflicts.rs at line 416
  [2.33376]

  [3.5425]
  +

  + {

  + let txn_ = txn_charlie.write();

  + let mut f = std::fs::File::create("/tmp/charlie1")?;

  + crate::pristine::debug(&*txn_, &txn_.graph(&*channel_charlie.read()), &mut f)?;

  + }

  +
• replacement in libpijul/src/tests/data/1252.1 at line 2
  [3.3326]→[3.3326:3341](∅→∅)
  [3.3326]
• replacement in libpijul/src/tests/conflict.rs at line 89
  [3.359846]→[3.359846:359922](∅→∅)
  − let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();
  [3.359846]

  [3.359922]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 100
  [3.360154]→[3.360154:360266](∅→∅)
  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

  − "================================",
  [3.360154]

  [3.360266]
  + ">>>>>>> 1",

  + "======= 1",
• replacement in libpijul/src/tests/conflict.rs at line 108
  [3.360416]→[3.360416:360472](∅→∅)
  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
  [3.360416]

  [3.360472]
  + "<<<<<<< 1",
• replacement in libpijul/src/tests/conflict.rs at line 309
  [3.365897]→[3.365897:365973](∅→∅)
  − let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();
  [3.365897]

  [3.365973]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  +

  + let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 321
  [3.366205]→[3.366205:366373](∅→∅)
  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

  − "================================",

  − "================================",
  [3.366205]

  [3.366373]
  + ">>>>>>> 1",

  + "======= 1",

  + "======= 1",
• replacement in libpijul/src/tests/conflict.rs at line 327
  [3.366448]→[3.366448:366504](∅→∅)
  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
  [3.366448]

  [3.366504]
  + "<<<<<<< 1",
• replacement in libpijul/src/tests/conflict.rs at line 400
  [3.368066]→[3.368066:368147](∅→∅)
  − let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();
  [3.368066]

  [3.2816]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let mut conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 408
  [3.368266]→[3.368266:368370](∅→∅)
  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

  − "================================",
  [3.368266]

  [3.368370]
  + ">>>>>>> 1",

  + "======= 1",
• replacement in libpijul/src/tests/conflict.rs at line 413
  [3.368433]→[3.368433:368485](∅→∅)
  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
  [3.368433]

  [3.368485]
  + "<<<<<<< 1",
• replacement in libpijul/src/tests/conflict.rs at line 704
  [3.17923]→[3.377504:377575](∅→∅),[3.24608]→[3.377504:377575](∅→∅),[3.377504]→[3.377504:377575](∅→∅)
  − assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));
  [3.377440]

  [3.377575]
  + let re = regex::bytes::Regex::new(r#"\[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let buf2_ = re.replace_all(&buf2, &[][..]);
• edit in libpijul/src/tests/conflict.rs at line 708
  [3.377576]

  [3.377576]
  + assert_eq!(std::str::from_utf8(&buf_), std::str::from_utf8(&buf2_));

  +
• replacement in libpijul/src/tests/conflict.rs at line 830
  [3.18442]→[3.381346:381417](∅→∅),[3.25064]→[3.381346:381417](∅→∅),[3.381346]→[3.381346:381417](∅→∅)
  − assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));
  [3.381282]

  [3.381417]
  + let re = regex::bytes::Regex::new(r#"\[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let buf2_ = re.replace_all(&buf2, &[][..]);

  + assert_eq!(std::str::from_utf8(&buf_), std::str::from_utf8(&buf2_));
• replacement in libpijul/src/tests/conflict.rs at line 1002
  [3.92]→[3.386401:386432](∅→∅),[3.386401]→[3.386401:386432](∅→∅)
  − assert_eq!(lines, lines2);
  [3.92]

  [3.386432]
  + assert_eq!(&lines[3..], &lines2[3..]);
• replacement in libpijul/src/tests/conflict.rs at line 1083
  [3.388991]→[3.2980:3031](∅→∅),[3.3031]→[3.389033:389380](∅→∅),[3.389033]→[3.389033:389380](∅→∅)
  − (&mut conflict[2..5]).sort_unstable();

  − assert_eq!(

  − conflict,

  − vec![

  − "a",

  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

  − "================================",

  − "x",

  − "y",

  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"

  − ]

  − );
  [3.388991]

  [3.389380]
  + conflict.sort_unstable();

  + assert_eq!(&conflict[3..], ["a", "x", "y",]);

  + assert_eq!(conflict[0], "<<<<<<< 1",);
• replacement in libpijul/src/tests/conflict.rs at line 1211
  [3.393273]→[3.393273:393558](∅→∅)
  − let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();

  − assert_eq!(

  − conflict,

  − vec![

  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

  − "x",

  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"

  − ]

  − );
  [3.393273]

  [3.393558]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();

  + assert_eq!(conflict, vec![">>>>>>> 0", "x", "<<<<<<< 0"]);
• replacement in libpijul/src/tests/conflict.rs at line 1287
  [3.395401]→[3.395401:395485](∅→∅)
  − let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();
  [3.395401]

  [3.395485]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let buf: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 1293
  [3.395557]→[3.395557:395613](∅→∅)
  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
  [3.395557]

  [3.395613]
  + ">>>>>>> 1",
• replacement in libpijul/src/tests/conflict.rs at line 1297
  [3.395688]→[3.395688:395744](∅→∅)
  − "================================",
  [3.395688]

  [3.395744]
  + "======= 1",
• replacement in libpijul/src/tests/conflict.rs at line 1301
  [3.395819]→[3.395819:395875](∅→∅)
  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
  [3.395819]

  [3.395875]
  + "<<<<<<< 1",
• replacement in libpijul/src/tests/conflict.rs at line 1306
  [3.395980]→[3.395980:396040](∅→∅)
  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
  [3.395980]

  [3.396040]
  + ">>>>>>> 1",
• replacement in libpijul/src/tests/conflict.rs at line 1310
  [3.396127]→[3.396127:396187](∅→∅)
  − "================================",
  [3.396127]

  [3.396187]
  + "======= 1",
• replacement in libpijul/src/tests/conflict.rs at line 1314
  [3.396274]→[3.396274:396334](∅→∅)
  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
  [3.396274]

  [3.396334]
  + "<<<<<<< 1",
• replacement in libpijul/src/tests/conflict.rs at line 1337
  [3.396908]→[3.396908:396992](∅→∅)
  − let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();
  [3.396908]

  [3.396992]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let buf: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 1343
  [3.397064]→[3.397064:397120](∅→∅)
  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
  [3.397064]

  [3.397120]
  + ">>>>>>> 1",
• replacement in libpijul/src/tests/conflict.rs at line 1347
  [3.397195]→[3.397195:397251](∅→∅)
  − "================================",
  [3.397195]

  [3.397251]
  + "======= 1",
• replacement in libpijul/src/tests/conflict.rs at line 1351
  [3.397326]→[3.397326:397382](∅→∅)
  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
  [3.397326]

  [3.397382]
  + "<<<<<<< 1",
• replacement in libpijul/src/tests/conflict.rs at line 1356
  [3.397487]→[3.397487:397547](∅→∅)
  − ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
  [3.397487]

  [3.397547]
  + ">>>>>>> 1",
• replacement in libpijul/src/tests/conflict.rs at line 1360
  [3.397634]→[3.397634:397694](∅→∅)
  − "================================",
  [3.397634]

  [3.397694]
  + "======= 1",
• replacement in libpijul/src/tests/conflict.rs at line 1364
  [3.397781]→[3.397781:397841](∅→∅)
  − "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
  [3.397781]

  [3.397841]
  + "<<<<<<< 1",
• replacement in libpijul/src/tests/conflict.rs at line 1506
  [3.402116]→[3.402116:402198](∅→∅)
  − let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();
  [3.402116]

  [3.3136]
  +

  + let re = regex::bytes::Regex::new(r#"\[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let buf2_ = re.replace_all(&buf2, &[][..]);

  +

  + let mut lines: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 1513
  [3.3163]→[3.402216:402300](∅→∅),[3.402216]→[3.402216:402300](∅→∅)
  − let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();
  [3.3163]

  [3.3164]
  + let mut lines2: Vec<_> = std::str::from_utf8(&buf2_).unwrap().lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 1664
  [3.406827]→[3.406827:406909](∅→∅)
  − let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();
  [3.406827]

  [3.3193]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  + let buf2_ = re.replace_all(&buf2, &[][..]);

  +

  + let mut lines: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 1670
  [3.3220]→[3.406927:407011](∅→∅),[3.406927]→[3.406927:407011](∅→∅)
  − let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();
  [3.3220]

  [3.3221]
  + let mut lines2: Vec<_> = std::str::from_utf8(&buf2_).unwrap().lines().collect();
• replacement in libpijul/src/tests/conflict.rs at line 1753
  [3.409766]→[3.409766:409910](∅→∅)
  − assert_eq!(

  − std::str::from_utf8(&buf),

  − Ok(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n")

  − );
  [3.409766]

  [3.409910]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);

  +

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

  − std::str::from_utf8(&buf2),

  − Ok(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n")

  − );
  [3.410878]

  [2.67977]
  + let buf2_ = re.replace_all(&buf2, &[][..]);

  +

  + assert_eq!(std::str::from_utf8(&buf2_), Ok(">>>>>>> 0\nx\n<<<<<<< 0\n"));
• edit in libpijul/src/tests/conflict.rs at line 1886
  [3.414006]

  [3.414006]
  + let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();

  + let buf_ = re.replace_all(&buf, &[][..]);
• replacement in libpijul/src/tests/conflict.rs at line 1889
  [3.414022]→[3.414022:414149](∅→∅)
  − std::str::from_utf8(&buf),

  − Ok(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\ny\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n")
  [3.414022]

  [3.414149]
  + std::str::from_utf8(&buf_),

  + Ok(">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n")