Skip to content

Commit 0355142

Browse files
committed
remove useless monkeypatch parameter
1 parent 7752c8a commit 0355142

File tree

6 files changed

+12
-20
lines changed

6 files changed

+12
-20
lines changed

test/test_commit.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55

66
@pytest.mark.parametrize("all_flag", ["", "-A", "--all", "--no-ignore-removal"])
7-
def test_commit(
8-
xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch, all_flag
9-
):
7+
def test_commit(xtl_clone, commit_env_config, git2cpp_path, tmp_path, all_flag):
108
assert (tmp_path / "xtl").exists()
119
xtl_path = tmp_path / "xtl"
1210

test/test_log.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55

66
@pytest.mark.parametrize("format_flag", ["", "--format=full", "--format=fuller"])
7-
def test_log(
8-
xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch, format_flag
9-
):
7+
def test_log(xtl_clone, commit_env_config, git2cpp_path, tmp_path, format_flag):
108
assert (tmp_path / "xtl").exists()
119
xtl_path = tmp_path / "xtl"
1210

@@ -47,7 +45,7 @@ def test_log_nogit(commit_env_config, git2cpp_path, tmp_path):
4745

4846
@pytest.mark.parametrize("max_count_flag", ["", "-n", "--max-count"])
4947
def test_max_count(
50-
xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch, max_count_flag
48+
xtl_clone, commit_env_config, git2cpp_path, tmp_path, max_count_flag
5149
):
5250
assert (tmp_path / "xtl").exists()
5351
xtl_path = tmp_path / "xtl"

test/test_merge.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55

66
# TODO: Have a different "person" for the commit and for the merge
77
# 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):
119
assert (tmp_path / "xtl").exists()
1210
xtl_path = tmp_path / "xtl"
1311

@@ -54,9 +52,7 @@ def test_merge_fast_forward(
5452
assert p_merge_2.stdout == "Already up-to-date\n"
5553

5654

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):
6056
assert (tmp_path / "xtl").exists()
6157
xtl_path = tmp_path / "xtl"
6258

@@ -118,9 +114,7 @@ def test_merge_commit(
118114

119115

120116
@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):
124118
assert (tmp_path / "xtl").exists()
125119
xtl_path = tmp_path / "xtl"
126120

test/test_remote.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ def test_fetch_depth(git2cpp_path, tmp_path, run_in_tmp_path):
321321
url = "https://github.com/xtensor-stack/xtl.git"
322322

323323
invalid_clone_cmd = [git2cpp_path, "clone", "--depth", "0", url]
324-
p_invalid_clone = subprocess.run(invalid_clone_cmd, capture_output=True, cwd=tmp_path, text=True)
324+
p_invalid_clone = subprocess.run(
325+
invalid_clone_cmd, capture_output=True, cwd=tmp_path, text=True
326+
)
325327
assert p_invalid_clone.returncode == 0
326328
assert p_invalid_clone.stdout.startswith("fatal: depth 0 is not a positive number")
327329

@@ -418,7 +420,7 @@ def test_remote_show_in_cloned_repo(xtl_clone, git2cpp_path, tmp_path):
418420
assert "http" in p.stdout or "git" in p.stdout or "https" in p.stdout
419421

420422

421-
def test_push_local(xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch):
423+
def test_push_local(xtl_clone, commit_env_config, git2cpp_path, tmp_path):
422424
"""Test setting push on a local remote."""
423425
assert (tmp_path / "xtl").exists()
424426
xtl_path = tmp_path / "xtl"

test/test_reset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pytest
44

55

6-
def test_reset(xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch):
6+
def test_reset(xtl_clone, commit_env_config, git2cpp_path, tmp_path):
77
assert (tmp_path / "xtl").exists()
88
xtl_path = tmp_path / "xtl"
99

test/test_revlist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pytest
44

55

6-
def test_revlist(xtl_clone, commit_env_config, git2cpp_path, tmp_path, monkeypatch):
6+
def test_revlist(xtl_clone, commit_env_config, git2cpp_path, tmp_path):
77
assert (tmp_path / "xtl").exists()
88
xtl_path = tmp_path / "xtl"
99

0 commit comments

Comments
 (0)