Merge pull request #26 from George-Ogden/empty-exceptions

Empty Exceptions

Author: George-Ogden

.mirror.lock

@@ -1,5 +1,5 @@
 # DANGER: EDIT AT YOUR OWN RISK. Track this file in version control so that others can sync files correctly.
-- commit: 96edaa5bb16a28eeea4f7a933c30088c2ee5df65
+- commit: 26f0c34dacfaf7ad3d790b9b8a005daf242960b2
   files:
   - .github/python-release.yaml
   - .github/python-test.yaml

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ ci:
 
 repos:
   - repo: https://github.com/George-Ogden/mirror-rorrim/
-    rev: v0.4.3
+    rev: v0.4.4
     hooks:
       - id: mirror-check
         fail_fast: true
@@ -33,7 +33,7 @@ repos:
         args: ["--severity=warning"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit/
-    rev: v0.14.10
+    rev: v0.14.13
     hooks:
       - id: ruff-check
         args:

README.md

@@ -70,7 +70,7 @@ If you use, `pre-commit`, consider adding this repo as a hook to check for updat
 
 ```yaml
 - repo: https://github.com/George-Ogden/mirror-rorrim/
-  rev: v0.4.4
+  rev: v0.4.5
   hooks:
     - id: mirror-check
 ```

mirror/main.py

@@ -29,7 +29,8 @@ def main(*args: P.args, **kwargs: P.kwargs) -> None:
         except BaseException as e:
             logger.debug(f"Threw {type(e)}!")
             logger.trace(traceback.format_exc())
-            logger.error(f"{type(e).__name__}: {e}")
+            message = str(e).strip()
+            logger.error(f"{type(e).__name__}{f': {message}' if message else ''}")
             sys.exit(1)
         if exitcode is not None:
             sys.exit(exitcode)

mirror/main_test.py

@@ -5,6 +5,7 @@
 import shutil
 import subprocess
 import sys
+from unittest import mock
 
 from inline_snapshot import snapshot
 import pytest
@@ -27,7 +28,7 @@ def remove_git_data(local: GitDir) -> None:
 
 
 @pytest.mark.parametrize(
-    "args, exitcode ,logs, setup_repo",
+    "args, exitcode, logs, setup_repo",
     [
         # install tests
         (
@@ -209,6 +210,40 @@ def test_main(
     assert normalize_message(out, git_dir=local_git_repo) == logs
 
 
+@pytest.mark.parametrize(
+    "args, logs, setup_repo",
+    [
+        (
+            # update mirror file
+            "sync",
+            snapshot("Updating all files [failed]    KeyboardInterrupt"),
+            "syncer_tests/update_mirror",
+        )
+    ],
+)
+def test_main_with_keyboard_interrupt(
+    args: str,
+    logs: str,
+    setup_repo: str | RelDir | None,
+    local_git_repo: GitDir,
+    test_data_path: AbsDir,
+    capsys: CaptureFixture,
+) -> None:
+    if setup_repo:
+        add_commit(local_git_repo, test_data_path / RelDir(setup_repo))
+    argv = ["-q", *shlex.split(args)]
+    mirror_existed_before = (local_git_repo / MIRROR_LOCK).exists()
+    with (
+        pytest.raises(SystemExit) as e,
+        mock.patch.object(GitHelper, "wait", mock.Mock(side_effect=[KeyboardInterrupt])),  # type: ignore [arg-type]
+    ):
+        main.main(argv, prog_name=MIRROR_NAME)
+    assert e.value.code != 0
+    assert (local_git_repo / MIRROR_LOCK).exists() == mirror_existed_before
+    out, _err = capsys.readouterr()
+    assert normalize_message(out, git_dir=local_git_repo) == logs
+
+
 @pytest.mark.slow
 def test_pre_commit_with_mirror(
     local_git_repo: GitDir, test_data_path: AbsDir, capfd: CaptureFixture

version.txt

@@ -1 +1 @@
-0.4.4
+0.4.5