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

tests: attempt to fix a flaky test

Browse source 
We saw a failure in `test_merge_views_git_heads()` in the GitHub CI,
but I wasn't able to reproduce it locally. Using the
`commit_transactions()` helper in the test should fix it.
This commit is contained in:
Martin von Zweigbergk 2023-07-16 14:26:45 -07:00 committed by Martin von Zweigbergk
parent 8149ec6df6
commit 8e7e32710d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/tests/test_view.rs
View file

@ -449,15 +449,13 @@ fn test_merge_views_git_heads() {
let tx1_head = write_random_commit(tx1.mut_repo(), &settings); let tx1_head = write_random_commit(tx1.mut_repo(), &settings);
tx1.mut_repo() tx1.mut_repo()
.set_git_head_target(RefTarget::normal(tx1_head.id().clone())); .set_git_head_target(RefTarget::normal(tx1_head.id().clone()));
tx1.commit();
let mut tx2 = repo.start_transaction(&settings, "test"); let mut tx2 = repo.start_transaction(&settings, "test");
let tx2_head = write_random_commit(tx2.mut_repo(), &settings); let tx2_head = write_random_commit(tx2.mut_repo(), &settings);
tx2.mut_repo() tx2.mut_repo()
.set_git_head_target(RefTarget::normal(tx2_head.id().clone())); .set_git_head_target(RefTarget::normal(tx2_head.id().clone()));
tx2.commit();
let repo = repo.reload_at_head(&settings).unwrap(); let repo = commit_transactions(&settings, vec![tx1, tx2]);
let expected_git_head = RefTarget::from_legacy_form( let expected_git_head = RefTarget::from_legacy_form(
[tx0_head.id().clone()], [tx0_head.id().clone()],
[tx1_head.id().clone(), tx2_head.id().clone()], [tx1_head.id().clone(), tx2_head.id().clone()],