|
5 | 5 |
|
6 | 6 | # TODO: Have a different "person" for the commit and for the merge |
7 | 7 | # TODO: Test "unborn" case, but how ? |
8 | | -def test_merge_fast_forward( |
9 | | - xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch |
10 | | -): |
| 8 | +def test_merge_fast_forward(xtl_clone, commit_env_config, git2cpp_path, tmp_path): |
11 | 9 | assert (tmp_path / "xtl").exists() |
12 | 10 | xtl_path = tmp_path / "xtl" |
13 | 11 |
|
@@ -54,9 +52,7 @@ def test_merge_fast_forward( |
54 | 52 | assert p_merge_2.stdout == "Already up-to-date\n" |
55 | 53 |
|
56 | 54 |
|
57 | | -def test_merge_commit( |
58 | | - xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch |
59 | | -): |
| 55 | +def test_merge_commit(xtl_clone, commit_env_config, git2cpp_path, tmp_path): |
60 | 56 | assert (tmp_path / "xtl").exists() |
61 | 57 | xtl_path = tmp_path / "xtl" |
62 | 58 |
|
@@ -118,9 +114,7 @@ def test_merge_commit( |
118 | 114 |
|
119 | 115 |
|
120 | 116 | @pytest.mark.parametrize("flag", ["--abort", "--quit", "--continue"]) |
121 | | -def test_merge_conflict( |
122 | | - xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch, flag |
123 | | -): |
| 117 | +def test_merge_conflict(xtl_clone, commit_env_config, git2cpp_path, tmp_path, flag): |
124 | 118 | assert (tmp_path / "xtl").exists() |
125 | 119 | xtl_path = tmp_path / "xtl" |
126 | 120 |
|
|
0 commit comments