ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

tests: update a test to not point a branch to an unreachable commit

Browse source 
The next patch would otherwise make this test fail because
"transaction 2" tries to point a branch to a commit that's not visible
(because it's created by the concurrent "transaction 1").
This commit is contained in:
Martin von Zweigbergk 2021-10-02 23:03:36 -07:00
parent bbe20e0ea6
commit 41ebdea415
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/tests/test_view.rs
View file

@ -184,6 +184,8 @@ fn test_merge_views_branches() {
testutils::create_random_commit(&settings, &repo).write_to_repo(mut_repo);
let main_branch_origin_tx0 =
testutils::create_random_commit(&settings, &repo).write_to_repo(mut_repo);
let main_branch_origin_tx1 =
testutils::create_random_commit(&settings, &repo).write_to_repo(mut_repo);
let main_branch_alternate_tx0 =
testutils::create_random_commit(&settings, &repo).write_to_repo(mut_repo);
mut_repo.set_local_branch(
@ -211,8 +213,6 @@ fn test_merge_views_branches() {
let mut tx1 = repo.start_transaction("test");
let main_branch_local_tx1 =
testutils::create_random_commit(&settings, &repo).write_to_repo(tx1.mut_repo());
let main_branch_origin_tx1 =
testutils::create_random_commit(&settings, &repo).write_to_repo(tx1.mut_repo());
tx1.mut_repo().set_local_branch(
"main".to_string(),
RefTarget::Normal(main_branch_local_tx1.id().clone()),