mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 15:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

tests: drop a few unnecessary --dry-run from tests

Browse source 
I think we should test actually performing the push when possible. I
think I initially used `--dry-run` because I thought it wasn't
possible to do local pushes with libgit2.
This commit is contained in:
Martin von Zweigbergk 2023-04-19 20:55:43 -07:00 committed by Martin von Zweigbergk
parent 6445ccea7b
commit 6cb64bd255
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/test_git_push.rs
View file

@ -111,11 +111,10 @@ fn test_git_push_parent_branch() {
&["describe", "-m", "modified branch1 commit"], &["describe", "-m", "modified branch1 commit"],
); );
test_env.jj_cmd_success(&workspace_root, &["new"]); test_env.jj_cmd_success(&workspace_root, &["new"]);
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "--dry-run"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin: Branch changes to push to origin:
Force branch branch1 from 45a3aa29e907 to d47326d59ee1 Force branch branch1 from 45a3aa29e907 to d47326d59ee1
Dry-run requested, not pushing.
"###); "###);
} }
@ -129,7 +128,7 @@ fn test_git_no_push_parent_branch_non_empty_commit() {
); );
test_env.jj_cmd_success(&workspace_root, &["new"]); test_env.jj_cmd_success(&workspace_root, &["new"]);
std::fs::write(workspace_root.join("file"), "file").unwrap(); std::fs::write(workspace_root.join("file"), "file").unwrap();
let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--dry-run"]); let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push"]);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Error: No current branch. Error: No current branch.
"###); "###);
@ -144,7 +143,7 @@ fn test_git_no_push_parent_branch_description() {
&["describe", "-m", "modified branch1 commit"], &["describe", "-m", "modified branch1 commit"],
); );
test_env.jj_cmd_success(&workspace_root, &["new", "-m", "non-empty description"]); test_env.jj_cmd_success(&workspace_root, &["new", "-m", "non-empty description"]);
let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--dry-run"]); let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push"]);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Error: No current branch. Error: No current branch.
"###); "###);
@ -411,8 +410,7 @@ fn test_git_push_deleted() {
Branch changes to push to origin: Branch changes to push to origin:
Delete branch branch1 from 45a3aa29e907 Delete branch branch1 from 45a3aa29e907
"###); "###);
let stdout = let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "--deleted"]);
test_env.jj_cmd_success(&workspace_root, &["git", "push", "--deleted", "--dry-run"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Nothing changed. Nothing changed.
"###); "###);