Fixing tests

pmeunier

Oct 21, 2021, 10:13 PM

HOTQHK5URWTJ4IBMSWYPZQOPHA2ZQSPQAN5MAKGUDUAC6LZRDKOQC

Dependencies

[2] V4T4SC7O Testing binary diff
[3] NO2QPRFL Adding rollback test
[4] YN63NUZO Sanakirja 1.0
[5] TIPZ7UXN Started fixing the tests for parallel record/output
[6] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
[7] I24UEJQL Various post-fire fixes
[8] GHO6DWPI Refactoring iterators
[9] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[10] I52XSRUH Massive cleanup, and simplification
[11] 3M7WBE24 Re-adding anyhow in the tests of libpijul
[12] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump

Change contents

replacement in "libpijul/src/tests/unrecord.rs" at line 590

[3.269402]→[3.269402:269433](∅→∅)

let p_inv = p_del.inverse(

[3.269402]

[3.269433]

let mut p_inv = p_del.inverse(
replacement in "libpijul/src/tests/unrecord.rs" at line 600

[3.269673]→[3.269673:269719](∅→∅)

let h_inv = changes.save_change(&p_inv)?;

[3.269673]

[3.9215]

let h_inv = changes.save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))?;
replacement in "libpijul/src/tests/unrecord.rs" at line 741

[3.275017]→[3.275017:275048](∅→∅)

let p_inv = p.inverse(

[3.275017]

[3.275048]

let mut p_inv = p.inverse(
replacement in "libpijul/src/tests/unrecord.rs" at line 751

[3.275320]→[3.275320:275378](∅→∅)

let h_inv = changes.save_change(&p_inv).unwrap();

[3.275320]

[3.275378]

let h_inv = changes
.save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))
.unwrap();
replacement in "libpijul/src/tests/rollback.rs" at line 60

[3.2102]→[3.2102:2162](∅→∅)

let p_inv = changes.get_change(&resb).unwrap().inverse(

[3.2102]

[3.2162]

let mut p_inv = changes.get_change(&resb).unwrap().inverse(
replacement in "libpijul/src/tests/rollback.rs" at line 70

[3.2401]→[3.23594:23648](∅→∅)

let h_inv = changes.save_change(&p_inv).unwrap();

[3.2401]

[3.13692]

let h_inv = changes
.save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))
.unwrap();
replacement in "libpijul/src/tests/rollback.rs" at line 127

[3.4617]→[3.4617:4677](∅→∅)

let p_inv = changes.get_change(&resb).unwrap().inverse(

[3.4617]

[3.4677]

let mut p_inv = changes.get_change(&resb).unwrap().inverse(
replacement in "libpijul/src/tests/rollback.rs" at line 137

[3.4916]→[3.4916:4962](∅→∅)

let h_inv = changes.save_change(&p_inv)?;

[3.4916]

[3.14684]

let h_inv = changes.save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))?;
edit in "libpijul/src/tests/mod.rs" at line 42

[3.28285]

[3.22279]

&crate::DEFAULT_SEPARATOR,
replacement in "libpijul/src/tests/mod.rs" at line 56

[3.290193]→[3.290193:290247](∅→∅)

let change0 = crate::change::Change::make_change(

[3.290193]

[3.20212]

let mut change0 = crate::change::Change::make_change(
replacement in "libpijul/src/tests/mod.rs" at line 73

[3.28444]→[3.290731:290776](∅→∅),[3.290731]→[3.290731:290776](∅→∅)

let hash = store.save_change(&change0)?;

[3.28444]

[3.290776]

let hash = store.save_change(&mut change0, |_, _| Ok::<_, anyhow::Error>(()))?;
replacement in "libpijul/src/tests/missing_context.rs" at line 266

[3.299662]→[3.299662:299696](∅→∅)

let inv = bob_change.inverse(

[3.299662]

[3.299696]

let mut inv = bob_change.inverse(
replacement in "libpijul/src/tests/missing_context.rs" at line 276

[3.299936]→[3.299936:299980](∅→∅)

let inv_h = changes.save_change(&inv)?;

[3.299936]

[3.299980]

let inv_h = changes.save_change(&mut inv, |_, _| Ok::<_, anyhow::Error>(()))?;
edit in "libpijul/src/tests/diff.rs" at line 78

[2.2829]

[2.2829]

Inode::ROOT,
edit in "libpijul/src/tests/diff.rs" at line 83

[2.2935]

[2.2935]

&crate::DEFAULT_SEPARATOR,
edit in "libpijul/src/tests/conflict.rs" at line 1186

[3.393790]

[3.62641]

&crate::DEFAULT_SEPARATOR,
replacement in "libpijul/src/tests/change.rs" at line 11

[3.83328]→[3.446584:446649](∅→∅),[3.446584]→[3.446584:446649](∅→∅)

fn hash_mismatch(change: &Change) -> Result<(), anyhow::Error> {

[3.83328]

[3.446649]

fn hash_mismatch(change: &mut Change) -> Result<(), anyhow::Error> {
replacement in "libpijul/src/tests/change.rs" at line 15

[3.446768]→[3.446768:446813](∅→∅)

let mut h = change.serialize(&mut buf)?;

[3.446768]

[3.446813]

let mut h = change.serialize(&mut buf, |_, _| Ok::<_, anyhow::Error>(()))?;
edit in "libpijul/src/tests/change.rs" at line 51

[3.448033]

[3.83597]

&crate::DEFAULT_SEPARATOR,
replacement in "libpijul/src/tests/change.rs" at line 66

[3.448343]→[3.448343:448397](∅→∅)

let change0 = crate::change::Change::make_change(

[3.448343]

[3.83720]

let mut change0 = crate::change::Change::make_change(
replacement in "libpijul/src/tests/change.rs" at line 80

[3.29876]→[3.448688:448734](∅→∅),[3.448688]→[3.448688:448734](∅→∅)

let hash0 = store.save_change(&change0)?;

[3.29876]

[3.83795]

let hash0 = store.save_change(&mut change0, |_, _| Ok::<_, anyhow::Error>(()))?;
replacement in "libpijul/src/tests/change.rs" at line 89

[3.448825]→[3.448825:448855](∅→∅)

hash_mismatch(&change0)?;

[3.448825]

[3.448899]

hash_mismatch(&mut change0)?;
replacement in "libpijul/src/tests/add_file.rs" at line 57

[3.30810]→[3.456088:456129](∅→∅),[3.456088]→[3.456088:456129](∅→∅)

assert_eq!(key, Position::ROOT);

[3.30810]

[3.456129]

let key_ = get_inode_vertex(&txn, &channel.graph, Position::ROOT)?;
assert_eq!(key, key_);
edit in "libpijul/src/tests/add_file.rs" at line 208

[3.25938]→[3.459869:459870](∅→∅),[3.32002]→[3.459869:459870](∅→∅),[3.39048]→[3.459869:459870](∅→∅),[3.88016]→[3.459869:459870](∅→∅),[3.459869]→[3.459869:459870](∅→∅)
edit in "libpijul/src/tests/add_file.rs" at line 463

[3.469508]

[3.469572]
edit in "libpijul/src/tests/add_file.rs" at line 667

[3.475569]

[3.36755]

&crate::DEFAULT_SEPARATOR,
edit in "libpijul/src/tests/add_file.rs" at line 678

[3.475762]

[3.36849]

&crate::DEFAULT_SEPARATOR,
replacement in "libpijul/src/tests/add_file.rs" at line 692

[3.476009]→[3.476009:476062](∅→∅)

let alice2 = crate::change::Change::make_change(

[3.476009]

[3.94242]

let mut alice2 = crate::change::Change::make_change(
replacement in "libpijul/src/tests/add_file.rs" at line 706

[3.31627]→[3.476352:476402](∅→∅),[3.476352]→[3.476352:476402](∅→∅)

let h_alice2 = changes.save_change(&alice2)?;

[3.31627]

[3.476402]

let h_alice2 = changes.save_change(&mut alice2, |_, _| Ok::<_, anyhow::Error>(()))?;
edit in "libpijul/src/tests/add_file.rs" at line 828

[3.480455]

/// Add a simple file, to test submodules.
#[test]
fn add_file2_test() -> Result<(), anyhow::Error> {
env_logger::try_init().unwrap_or(());
let repo = working_copy::memory::Memory::new();
let changes = changestore::memory::Memory::new();
repo.add_file("a/b/c/file", b"a\nb\nc\nd\ne\nf\n".to_vec());
let env = pristine::sanakirja::Pristine::new_anon()?;
{
let txn = env.arc_txn_begin().unwrap();
txn.write().add_file("a/b/c/file", 0).unwrap();
let channel = txn.write().open_or_create_channel("main").unwrap();
record_all(&repo, &changes, &txn, &channel, "").unwrap();
txn.commit().unwrap()
}

let repo2 = working_copy::memory::Memory::new();
repo2.add_file("a/b/c/file", b"w\nx\ny\nz\n".to_vec());
let change = {
let txn = env.arc_txn_begin().unwrap();
txn.write().add_file("a/b/c/file", 0).unwrap();

let channel = txn.write().open_or_create_channel("other").unwrap();
let change = record_all(&repo, &changes, &txn, &channel, "").unwrap();
txn.commit().unwrap();
change
};

let txn = env.arc_txn_begin().unwrap();
let channel = txn.write().open_or_create_channel("main").unwrap();
apply::apply_change(&changes, &mut *txn.write(), &mut *channel.write(), &change)?;
output::output_repository_no_pending(&repo, &changes, &txn, &channel, "", true, None, 1, 0)?;

Ok(())
}
edit in "libpijul/src/alive/dfs.rs" at line 89

[3.1002747]

[3.1002747]

extra: Vec::new(),