fix(cli,bump): remove ExpectedExit to fix exception raised issue on expected command execution

Author: bearomorphism

commitizen/cli.py

@@ -16,7 +16,6 @@
 from commitizen.exceptions import (
     CommitizenException,
     ExitCode,
-    ExpectedExit,
     InvalidCommandArgumentError,
     NoCommandFoundError,
 )
@@ -634,7 +633,7 @@ def main() -> None:
     # Show help if no arg provided
     if len(sys.argv) == 1:
         parser.print_help(sys.stderr)
-        raise ExpectedExit()
+        return
 
     # This is for the command required constraint in 2.0
     try:

commitizen/commands/bump.py

@@ -14,7 +14,6 @@
     BumpCommitFailedError,
     BumpTagFailedError,
     DryRunExit,
-    ExpectedExit,
     InvalidManualVersion,
     NoCommitsFoundError,
     NoneIncrementExit,
@@ -367,7 +366,7 @@ def __call__(self) -> None:
             )
 
         if self.arguments["files_only"]:
-            raise ExpectedExit()
+            return
 
         # FIXME: check if any changes have been staged
         git.add(*updated_files)

tests/commands/test_bump_command.py

@@ -18,7 +18,6 @@
     CurrentVersionNotFoundError,
     DryRunExit,
     ExitCode,
-    ExpectedExit,
     InvalidManualVersion,
     NoCommitsFoundError,
     NoneIncrementExit,
@@ -469,8 +468,7 @@ def test_bump_files_only(tmp_commitizen_project, util: UtilFixture):
     assert tag_exists is True
 
     util.create_file_and_commit("feat: another new feature")
-    with pytest.raises(ExpectedExit):
-        util.run_cli("bump", "--yes", "--files-only")
+    util.run_cli("bump", "--yes", "--files-only")
 
     tag_exists = git.tag_exist("0.3.0")
     assert tag_exists is False
@@ -519,8 +517,7 @@ def test_bump_dry_run(util: UtilFixture, capsys):
 def test_bump_in_non_git_project(tmpdir, config, util: UtilFixture):
     with tmpdir.as_cwd():
         with pytest.raises(NotAGitProjectError):
-            with pytest.raises(ExpectedExit):
-                util.run_cli("bump", "--yes")
+            util.run_cli("bump", "--yes")
 
 
 def test_none_increment_exit_should_be_a_class():
@@ -1266,8 +1263,7 @@ def test_bump_changelog_contains_increment_only(
     # Add a commit and create the incremental changelog to v3.0.0
     # it should only include v3 changes
     util.create_file_and_commit("feat(next)!: next version")
-    with pytest.raises(ExpectedExit):
-        util.run_cli("bump", "--yes", "--files-only", "--changelog-to-stdout")
+    util.run_cli("bump", "--yes", "--files-only", "--changelog-to-stdout")
     out, _ = capsys.readouterr()
 
     assert "3.0.0" in out

tests/test_cli.py

@@ -10,7 +10,6 @@
 from commitizen import cli
 from commitizen.exceptions import (
     ConfigFileNotFound,
-    ExpectedExit,
     InvalidCommandArgumentError,
     NoCommandFoundError,
     NotAGitProjectError,
@@ -19,10 +18,9 @@
 
 
 def test_sysexit_no_argv(util: UtilFixture, capsys):
-    with pytest.raises(ExpectedExit):
-        util.run_cli()
-        out, _ = capsys.readouterr()
-        assert out.startswith("usage")
+    util.run_cli()
+    _, err = capsys.readouterr()
+    assert err.startswith("usage")
 
 
 def test_cz_config_file_without_correct_file_path(util: UtilFixture, capsys):