Commit 3bb6cbd

BogayLee-W

authored and

committed

test: fix some incompatible types of function calls

1 parent ffd0989 commit 3bb6cbdCopy full SHA for 3bb6cbd

File tree

3 files changed

+11

-8

lines changed

commitizen/commands
- check.py
tests
- commands
  - test_commit_command.py
- test_cli.py

3 files changed

+11

-8

lines changed

`‎commitizen/commands/check.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import os`
`2`	`2`	`import re`
`3`	`3`	`import sys`
`4`		`-from typing import Dict, Optional`
	`4`	`+from typing import Any, Dict, Optional`
`5`	`5`
`6`	`6`	`from commitizen import factory, git, out`
`7`	`7`	`from commitizen.config import BaseConfig`
`@@ -15,7 +15,7 @@`
`15`	`15`	`class Check:`
`16`	`16`	`"""Check if the current commit msg matches the commitizen format."""`
`17`	`17`
`18`		`- def __init__(self, config: BaseConfig, arguments: Dict[str, str], cwd=os.getcwd()):`
	`18`	`+ def __init__(self, config: BaseConfig, arguments: Dict[str, Any], cwd=os.getcwd()):`
`19`	`19`	`"""Initial check command.`
`20`	`20`
`21`	`21`	`Args:`

`‎tests/commands/test_commit_command.py‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ def test_commit(config, mocker: MockFixture):`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`commit_mock = mocker.patch("commitizen.git.commit")`
`38`		`- commit_mock.return_value = cmd.Command("success", "", "", "", 0)`
	`38`	`+ commit_mock.return_value = cmd.Command("success", "", b"", b"", 0)`
`39`	`39`	`success_mock = mocker.patch("commitizen.out.success")`
`40`	`40`
`41`	`41`	`commands.Commit(config, {})()`
`@@ -45,7 +45,7 @@ def test_commit(config, mocker: MockFixture):`
`45`	`45`	`@pytest.mark.usefixtures("staging_is_clean")`
`46`	`46`	`def test_commit_retry_fails_no_backup(config, mocker: MockFixture):`
`47`	`47`	`commit_mock = mocker.patch("commitizen.git.commit")`
`48`		`- commit_mock.return_value = cmd.Command("success", "", "", "", 0)`
	`48`	`+ commit_mock.return_value = cmd.Command("success", "", b"", b"", 0)`
`49`	`49`
`50`	`50`	`with pytest.raises(NoCommitBackupError) as excinfo:`
`51`	`51`	`commands.Commit(config, {"retry": True})()`
`@@ -66,7 +66,7 @@ def test_commit_retry_works(config, mocker: MockFixture):`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`commit_mock = mocker.patch("commitizen.git.commit")`
`69`		`- commit_mock.return_value = cmd.Command("", "error", "", "", 9)`
	`69`	`+ commit_mock.return_value = cmd.Command("", "error", b"", b"", 9)`
`70`	`70`	`error_mock = mocker.patch("commitizen.out.error")`
`71`	`71`
`72`	`72`	`with pytest.raises(CommitError):`
`@@ -80,7 +80,7 @@ def test_commit_retry_works(config, mocker: MockFixture):`
`80`	`80`
`81`	`81`	`# Previous commit failed, so retry should pick up the backup commit`
`82`	`82`	`# commit_mock = mocker.patch("commitizen.git.commit")`
`83`		`- commit_mock.return_value = cmd.Command("success", "", "", "", 0)`
	`83`	`+ commit_mock.return_value = cmd.Command("success", "", b"", b"", 0)`
`84`	`84`	`success_mock = mocker.patch("commitizen.out.success")`
`85`	`85`
`86`	`86`	`commands.Commit(config, {"retry": True})()`
`@@ -121,7 +121,7 @@ def test_commit_command_with_signoff_option(config, mocker: MockFixture):`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`commit_mock = mocker.patch("commitizen.git.commit")`
`124`		`- commit_mock.return_value = cmd.Command("success", "", "", "", 0)`
	`124`	`+ commit_mock.return_value = cmd.Command("success", "", b"", b"", 0)`
`125`	`125`	`success_mock = mocker.patch("commitizen.out.success")`
`126`	`126`
`127`	`127`	`commands.Commit(config, {"signoff": True})()`

`‎tests/test_cli.py‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import os`
`2`	`2`	`import subprocess`
`3`	`3`	`import sys`
	`4`	`+from functools import partial`
`4`	`5`
`5`	`6`	`import pytest`
`6`	`7`	`from pytest_mock import MockFixture`
`@@ -61,7 +62,9 @@ def test_arg_debug(mocker: MockFixture):`
`61`	`62`	`testargs = ["cz", "--debug", "info"]`
`62`	`63`	`mocker.patch.object(sys, "argv", testargs)`
`63`	`64`	`cli.main()`
`64`		`- assert sys.excepthook.keywords.get("debug") is True`
	`65`	`+ excepthook = sys.excepthook`
	`66`	`+ assert isinstance(excepthook, partial)`
	`67`	`+ assert excepthook.keywords.get("debug") is True`
`65`	`68`
`66`	`69`
`67`	`70`	`def test_commitizen_excepthook(capsys):`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 3bb6cbd

File tree

3 files changed

3 files changed

`‎commitizen/commands/check.py‎`

`‎tests/commands/test_commit_command.py‎`

`‎tests/test_cli.py‎`

0 commit comments