Fix test compilation

[?]
FHRXP5Jnb2MWLDrPrnLnkN2ryWcGCo6CRr1dXR9FW2YA
Dec 8, 2021, 10:29 PM
BC3QS46ORO56YB2LO3PRU74ITVOYFFKL3GGIBPV4M2DPH6NYJMEAC

Dependencies

  • [2] HOTQHK5U Fixing tests
  • [3] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
  • [4] MCAUAMZZ fix libpijul tests, and an unnecessary clone
  • [5] SHSJ3Y53 Fixing more tests
  • [6] TIPZ7UXN Started fixing the tests for parallel record/output
  • [7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [8] I52XSRUH Massive cleanup, and simplification
  • [9] GHO6DWPI Refactoring iterators
  • [10] 55SCQOOH Fixing the tests
  • [11] 3M7WBE24 Re-adding anyhow in the tests of libpijul
  • [12] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
  • [13] YN63NUZO Sanakirja 1.0
  • [14] 6YMDOZIB Refactoring apply
  • [*] V4T4SC7O Testing binary diff

Change contents

  • replacement in libpijul/src/tests/unrecord.rs at line 274
    [3.258369][3.258369:258398]()
    match conflicts[0] {
    [3.258369]
    [3.258398]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/unrecord.rs at line 335
    [3.6130][3.260711:260719](),[3.12007][3.260711:260719](),[3.20816][3.260711:260719](),[3.260711][3.260711:260719]()
    )?;
    [3.6130]
    [3.260719]
    )?.into_iter().collect::<Vec<_>>();
  • replacement in libpijul/src/tests/unrecord.rs at line 510
    [3.266722][3.266722:266747]()
    match conflicts[0] {
    [3.266722]
    [3.266747]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/unrecord.rs at line 537
    [3.267718][3.267718:267743]()
    match conflicts[0] {
    [3.267718]
    [3.267743]
    match conflicts.iter().next().unwrap() {
  • edit in libpijul/src/tests/mod.rs at line 43
    [3.28285]
    [2.610]
    false,
  • replacement in libpijul/src/tests/file_conflicts.rs at line 77
    [3.308228][3.308228:308253]()
    match conflicts[0] {
    [3.308228]
    [3.308253]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 124
    [3.309227][3.309227:309252]()
    match conflicts[0] {
    [3.309227]
    [3.309252]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 918
    [3.31009][3.335671:335679](),[3.40603][3.335671:335679](),[3.335671][3.335671:335679]()
    )?;
    [3.40603]
    [3.335741]
    )?.into_iter().collect::<Vec<_>>();
  • replacement in libpijul/src/tests/file_conflicts.rs at line 964
    [3.31183][3.337016:337024](),[3.41437][3.337016:337024](),[3.337016][3.337016:337024]()
    )?;
    [3.41437]
    [3.41438]
    )?.into_iter().collect::<Vec<_>>();
  • replacement in libpijul/src/tests/file_conflicts.rs at line 966
    [3.41439][3.41439:41476]()
    assert_eq!(conflicts, expected);
    [3.41439]
    [3.337274]
    assert_eq!(&conflicts[..], &expected[..]);
  • replacement in libpijul/src/tests/file_conflicts.rs at line 998
    [3.31471][3.338246:338254](),[3.41902][3.338246:338254](),[3.338246][3.338246:338254](),[3.338254][3.41903:41940]()
    )?;
    assert_eq!(conflicts, expected);
    [3.41902]
    [3.338448]
    )?.into_iter().collect::<Vec<_>>();
    assert_eq!(&conflicts[..], &expected[..]);
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1082
    [3.341414][3.341414:341439]()
    match conflicts[0] {
    [3.341414]
    [3.341439]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1167
    [3.6078][3.6078:6103]()
    match conflicts[0] {
    [3.6078]
    [3.6103]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1187
    [3.345019][3.345019:345044]()
    match conflicts[0] {
    [3.345019]
    [3.345044]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1207
    [3.345577][3.345577:345602]()
    match conflicts[0] {
    [3.345577]
    [3.345602]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1279
    [3.348005][3.348005:348030]()
    match conflicts[0] {
    [3.348005]
    [3.348030]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1323
    [3.349280][3.349280:349305]()
    match conflicts[0] {
    [3.349280]
    [3.349305]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1513
    [3.355605][3.355605:355630]()
    match conflicts[0] {
    [3.355605]
    [3.355630]
    match conflicts.iter().next().unwrap() {
  • replacement in libpijul/src/tests/file_conflicts.rs at line 1551
    [3.356674][3.356674:356699]()
    match conflicts[0] {
    [3.356674]
    [3.356699]
    match conflicts.iter().next().unwrap() {
  • edit in libpijul/src/tests/diff.rs at line 77
    [16.2802]
    [16.2802]
    false,
  • edit in libpijul/src/tests/conflict.rs at line 1224
    [3.393790]
    [2.979]
    false,
  • replacement in libpijul/src/tests/clone.rs at line 35
    [3.442660][3.29556:29656](),[3.29656][3.81770:81832]()
    for channel in txn.iter_channels("").unwrap() {
    let channel = channel.unwrap();
    for x in txn.log(&channel.1.read(), 0).unwrap() {
    [3.442660]
    [3.29718]
    for channel in txn.channels("")? {
    for x in txn.log(&channel.read(), 0).unwrap() {
  • edit in libpijul/src/tests/change.rs at line 51
    [3.448033]
    [2.1174]
    false,
  • replacement in libpijul/src/tests/add_file.rs at line 569
    [3.472592][3.472592:472621]()
    match conflicts[0] {
    [3.472592]
    [3.472621]
    match conflicts.iter().next().unwrap() {
  • edit in libpijul/src/tests/add_file.rs at line 668
    [3.475569]
    [2.1504]
    false,
  • edit in libpijul/src/tests/add_file.rs at line 680
    [3.475762]
    [2.1540]
    false,