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: another attempt to fix remaining flaky tests in test_view.rs

Browse source 
This is another commit like 0f3bd7fb03 and 8e7e32710d. I don't
know how I didn't catch all remaining instances last time :(
This commit is contained in:
Martin von Zweigbergk 2023-08-04 16:21:45 -07:00 committed by Martin von Zweigbergk
parent 688029428b
commit 56109bda38
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/tests/test_view.rs
View file

@ -106,7 +106,6 @@ fn test_merge_views_heads() {
let head_add_tx1 = write_random_commit(tx1.mut_repo(), &settings); let head_add_tx1 = write_random_commit(tx1.mut_repo(), &settings);
let public_head_add_tx1 = write_random_commit(tx1.mut_repo(), &settings); let public_head_add_tx1 = write_random_commit(tx1.mut_repo(), &settings);
tx1.mut_repo().add_public_head(&public_head_add_tx1); tx1.mut_repo().add_public_head(&public_head_add_tx1);
tx1.commit();
let mut tx2 = repo.start_transaction(&settings, "test"); let mut tx2 = repo.start_transaction(&settings, "test");
tx2.mut_repo().remove_head(head_remove_tx2.id()); tx2.mut_repo().remove_head(head_remove_tx2.id());
@ -115,9 +114,8 @@ fn test_merge_views_heads() {
let head_add_tx2 = write_random_commit(tx2.mut_repo(), &settings); let head_add_tx2 = write_random_commit(tx2.mut_repo(), &settings);
let public_head_add_tx2 = write_random_commit(tx2.mut_repo(), &settings); let public_head_add_tx2 = write_random_commit(tx2.mut_repo(), &settings);
tx2.mut_repo().add_public_head(&public_head_add_tx2); tx2.mut_repo().add_public_head(&public_head_add_tx2);
tx2.commit();
let repo = repo.reload_at_head(&settings).unwrap(); let repo = commit_transactions(&settings, vec![tx1, tx2]);
let expected_heads = hashset! { let expected_heads = hashset! {
head_unchanged.id().clone(), head_unchanged.id().clone(),
@ -200,7 +198,6 @@ fn test_merge_views_checkout() {
tx1.mut_repo() tx1.mut_repo()
.set_wc_commit(ws6_id.clone(), commit2.id().clone()) .set_wc_commit(ws6_id.clone(), commit2.id().clone())
.unwrap(); .unwrap();
tx1.commit();
let mut tx2 = repo.start_transaction(&settings, "test"); let mut tx2 = repo.start_transaction(&settings, "test");
tx2.mut_repo() tx2.mut_repo()
@ -216,12 +213,8 @@ fn test_merge_views_checkout() {
tx2.mut_repo() tx2.mut_repo()
.set_wc_commit(ws7_id.clone(), commit3.id().clone()) .set_wc_commit(ws7_id.clone(), commit3.id().clone())
.unwrap(); .unwrap();
// Make sure the end time different, assuming the clock has sub-millisecond
// precision.
std::thread::sleep(std::time::Duration::from_millis(1));
tx2.commit();
let repo = repo.reload_at_head(&settings).unwrap(); let repo = commit_transactions(&settings, vec![tx1, tx2]);
// We currently arbitrarily pick the first transaction's working-copy commit // We currently arbitrarily pick the first transaction's working-copy commit
// (first by transaction end time). // (first by transaction end time).
@ -285,7 +278,6 @@ fn test_merge_views_branches() {
"feature", "feature",
RefTarget::normal(feature_branch_tx1.id().clone()), RefTarget::normal(feature_branch_tx1.id().clone()),
); );
tx1.commit();
let mut tx2 = repo.start_transaction(&settings, "test"); let mut tx2 = repo.start_transaction(&settings, "test");
let main_branch_local_tx2 = write_random_commit(tx2.mut_repo(), &settings); let main_branch_local_tx2 = write_random_commit(tx2.mut_repo(), &settings);
@ -298,9 +290,8 @@ fn test_merge_views_branches() {
"origin", "origin",
RefTarget::normal(main_branch_origin_tx1.id().clone()), RefTarget::normal(main_branch_origin_tx1.id().clone()),
); );
tx2.commit();
let repo = repo.reload_at_head(&settings).unwrap(); let repo = commit_transactions(&settings, vec![tx1, tx2]);
let expected_main_branch = BranchTarget { let expected_main_branch = BranchTarget {
local_target: RefTarget::from_legacy_form( local_target: RefTarget::from_legacy_form(
[main_branch_local_tx0.id().clone()], [main_branch_local_tx0.id().clone()],