test: replace try with pytest.raises (#1654)

Author: bearomorphism

tests/commands/test_bump_command.py

@@ -646,13 +646,11 @@ def test_none_increment_should_not_call_git_tag_and_error_code_is_not_zero(
     dummy_value = git.tag("0.0.2")
     git.tag = MagicMock(return_value=dummy_value)
 
-    with pytest.raises(NoneIncrementExit):
-        try:
-            cli.main()
-        except NoneIncrementExit as e:
-            git.tag.assert_not_called()
-            assert e.exit_code == ExitCode.NO_INCREMENT
-            raise e
+    with pytest.raises(NoneIncrementExit) as e:
+        cli.main()
+
+    git.tag.assert_not_called()
+    assert e.value.exit_code == ExitCode.NO_INCREMENT
 
     # restore pop stashed
     git.tag = stashed_git_tag

tests/commands/test_changelog_command.py

@@ -292,10 +292,11 @@ def test_changelog_hook(mocker: MockFixture, config: BaseConfig, dry_run: bool):
         config, {"unreleased_version": None, "incremental": True, "dry_run": dry_run}
     )
     mocker.patch.object(changelog.cz, "changelog_hook", changelog_hook_mock)
-    try:
+    if dry_run:
+        with pytest.raises(DryRunExit):
+            changelog()
+    else:
         changelog()
-    except DryRunExit:
-        pass
 
     full_changelog = (
         "## Unreleased\n\n### Refactor\n\n- is in changelog\n\n### Feat\n\n- new file\n"

tests/test_git.py

@@ -8,7 +8,8 @@
 import pytest
 from pytest_mock import MockFixture
 
-from commitizen import cmd, exceptions, git
+from commitizen import cmd, git
+from commitizen.exceptions import GitCommandError
 from tests.utils import (
     FakeCommand,
     create_branch,
@@ -110,10 +111,13 @@ def test_git_message_with_empty_body():
 
 @pytest.mark.usefixtures("tmp_commitizen_project")
 def test_get_log_as_str_list_empty():
-    """ensure an exception or empty list in an empty project"""
+    """
+    Ensure an exception is raised or empty list in an empty project.
+    The behavior is different depending on the version of git.
+    """
     try:
         gitlog = git._get_log_as_str_list(start=None, end="HEAD", args="")
-    except exceptions.GitCommandError:
+    except GitCommandError:
         return
     assert len(gitlog) == 0, "list should be empty if no assert"
 
@@ -409,7 +413,7 @@ def test_get_filenames_in_commit_error(mocker: MockFixture):
         "commitizen.cmd.run",
         return_value=FakeCommand(out="", err="fatal: bad object HEAD", return_code=1),
     )
-    with pytest.raises(exceptions.GitCommandError) as excinfo:
+    with pytest.raises(GitCommandError) as excinfo:
         git.get_filenames_in_commit()
     assert str(excinfo.value) == "fatal: bad object HEAD"
 
@@ -497,5 +501,5 @@ def test_get_default_branch_error(mocker: MockFixture):
             return_code=1,
         ),
     )
-    with pytest.raises(exceptions.GitCommandError):
+    with pytest.raises(GitCommandError):
         git.get_default_branch()