mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 06:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: some fixups to test_transaction as a result of reordering commits

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-02-15 08:47:51 -08:00
parent 3c832cbbbe
commit 0f56e014b7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/tests/test_transaction.rs
View file

@ -311,10 +311,10 @@ fn test_add_head_success(use_git: bool) {
let mut tx = repo.start_transaction("test");
assert!(!tx.view().heads().contains(new_commit.id()));
assert!(!tx.as_repo_ref().index().has_id(new_commit.id()));
assert!(!tx.index().has_id(new_commit.id()));
tx.add_head(&new_commit);
assert!(tx.view().heads().contains(new_commit.id()));
assert!(tx.as_repo_ref().index().has_id(new_commit.id()));
assert!(tx.index().has_id(new_commit.id()));
tx.commit();
Arc::get_mut(&mut repo).unwrap().reload();
assert!(repo.view().heads().contains(new_commit.id()));
@ -376,6 +376,9 @@ fn test_add_head_not_immediate_child(use_git: bool) {
assert!(tx.view().heads().contains(initial.id()));
assert!(!tx.view().heads().contains(rewritten.id()));
assert!(tx.view().heads().contains(child.id()));
assert!(tx.index().has_id(initial.id()));
assert!(tx.index().has_id(rewritten.id()));
assert!(tx.index().has_id(child.id()));
assert!(tx.evolution().is_obsolete(initial.id()));
tx.discard();
}