mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 15:16:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

test_git_fetch: make different remotes in test contain different commits

Browse source 
Using the same commits (and thus the same commit id) in multiple remotes
makes it harder to see what comes from where.
This commit is contained in:
Samuel Tardieu 2023-02-24 18:24:48 +01:00
parent 0b083b2ddb
commit 1056cfa41a
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/test_git_fetch.rs
View file

@ -24,7 +24,7 @@ fn add_git_remote(test_env: &TestEnvironment, repo_path: &Path, remote: &str) {
let signature = let signature =
git2::Signature::new("Some One", "some.one@example.com", &git2::Time::new(0, 0)).unwrap(); git2::Signature::new("Some One", "some.one@example.com", &git2::Time::new(0, 0)).unwrap();
let mut tree_builder = git_repo.treebuilder(None).unwrap(); let mut tree_builder = git_repo.treebuilder(None).unwrap();
let file_oid = git_repo.blob(b"content").unwrap(); let file_oid = git_repo.blob(remote.as_bytes()).unwrap();
tree_builder tree_builder
.insert("file", file_oid, git2::FileMode::Blob.into()) .insert("file", file_oid, git2::FileMode::Blob.into())
.unwrap(); .unwrap();
@ -85,7 +85,7 @@ fn test_git_fetch_default_remote() {
test_env.jj_cmd_success(&repo_path, &["git", "fetch"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
origin: 9f01a0e04879 message origin: ffecd2d67827 message
"###); "###);
} }
@ -98,7 +98,7 @@ fn test_git_fetch_single_remote() {
test_env.jj_cmd_success(&repo_path, &["git", "fetch", "--remote", "rem1"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch", "--remote", "rem1"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
rem1: 9f01a0e04879 message rem1: 6a21102783e8 message
"###); "###);
} }
@ -112,7 +112,7 @@ fn test_git_fetch_single_remote_from_config() {
test_env.jj_cmd_success(&repo_path, &["git", "fetch"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
rem1: 9f01a0e04879 message rem1: 6a21102783e8 message
"###); "###);
} }
@ -129,8 +129,8 @@ fn test_git_fetch_multiple_remotes() {
&["git", "fetch", "--remote", "rem1", "--remote", "rem2"], &["git", "fetch", "--remote", "rem1", "--remote", "rem2"],
); );
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
rem1: 9f01a0e04879 message rem1: 6a21102783e8 message
rem2: 9f01a0e04879 message rem2: 2497a8a08f85 message
"###); "###);
} }
@ -145,8 +145,8 @@ fn test_git_fetch_multiple_remotes_from_config() {
test_env.jj_cmd_success(&repo_path, &["git", "fetch"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
rem1: 9f01a0e04879 message rem1: 6a21102783e8 message
rem2: 9f01a0e04879 message rem2: 2497a8a08f85 message
"###); "###);
} }
@ -192,7 +192,7 @@ fn test_git_fetch_prune_before_updating_tips() {
add_git_remote(&test_env, &repo_path, "origin"); add_git_remote(&test_env, &repo_path, "origin");
test_env.jj_cmd_success(&repo_path, &["git", "fetch"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
origin: 9f01a0e04879 message origin: ffecd2d67827 message
"###); "###);
// Remove origin branch in git repo and create origin/subname // Remove origin branch in git repo and create origin/subname
@ -205,7 +205,7 @@ fn test_git_fetch_prune_before_updating_tips() {
test_env.jj_cmd_success(&repo_path, &["git", "fetch"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
origin/subname: 9f01a0e04879 message origin/subname: ffecd2d67827 message
"###); "###);
} }
@ -231,8 +231,8 @@ fn test_git_fetch_conflicting_branches() {
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
rem1 (conflicted): rem1 (conflicted):
+ fcdbbd731496 (no description set) + fcdbbd731496 (no description set)
+ 9f01a0e04879 message + 6a21102783e8 message
@rem1 (behind by 1 commits): 9f01a0e04879 message @rem1 (behind by 1 commits): 6a21102783e8 message
"###); "###);
} }
@ -262,8 +262,8 @@ fn test_git_fetch_conflicting_branches_colocated() {
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
rem1 (conflicted): rem1 (conflicted):
+ f652c32197cf (no description set) + f652c32197cf (no description set)
+ 9f01a0e04879 message + 6a21102783e8 message
@rem1 (behind by 1 commits): 9f01a0e04879 message @rem1 (behind by 1 commits): 6a21102783e8 message
"###); "###);
} }