From a9e1940f7e3376dad284416bbff95fdb064f8141 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Mon, 4 Sep 2017 13:42:19 -0700 Subject: [PATCH] Use SystemExit instead of PreCommitSystemExit --- pre_commit/error_handler.py | 7 +------ tests/error_handler_test.py | 4 ++-- tests/main_test.py | 3 +-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pre_commit/error_handler.py b/pre_commit/error_handler.py index a661cc4f..b248f934 100644 --- a/pre_commit/error_handler.py +++ b/pre_commit/error_handler.py @@ -14,11 +14,6 @@ from pre_commit.errors import FatalError from pre_commit.store import Store -# For testing purposes -class PreCommitSystemExit(SystemExit): - pass - - def _to_bytes(exc): try: return bytes(exc) @@ -39,7 +34,7 @@ def _log_and_exit(msg, exc, formatted): with open(os.path.join(store.directory, 'pre-commit.log'), 'wb') as log: output.write(error_msg, stream=log) output.write_line(formatted, stream=log) - raise PreCommitSystemExit(1) + raise SystemExit(1) @contextlib.contextmanager diff --git a/tests/error_handler_test.py b/tests/error_handler_test.py index 1d53c4b7..bdc54b6a 100644 --- a/tests/error_handler_test.py +++ b/tests/error_handler_test.py @@ -75,7 +75,7 @@ def test_error_handler_uncaught_error(mocked_log_and_exit): def test_log_and_exit(cap_out, mock_out_store_directory): - with pytest.raises(error_handler.PreCommitSystemExit): + with pytest.raises(SystemExit): error_handler._log_and_exit( 'msg', FatalError('hai'), "I'm a stacktrace", ) @@ -96,7 +96,7 @@ def test_log_and_exit(cap_out, mock_out_store_directory): def test_error_handler_non_ascii_exception(mock_out_store_directory): - with pytest.raises(error_handler.PreCommitSystemExit): + with pytest.raises(SystemExit): with error_handler.error_handler(): raise ValueError('☃') diff --git a/tests/main_test.py b/tests/main_test.py index 0425b8d2..4348b8ce 100644 --- a/tests/main_test.py +++ b/tests/main_test.py @@ -7,7 +7,6 @@ import mock import pytest from pre_commit import main -from pre_commit.error_handler import PreCommitSystemExit from pre_commit.util import cwd from testing.auto_namedtuple import auto_namedtuple @@ -120,7 +119,7 @@ def test_expected_fatal_error_no_git_repo( tempdir_factory, cap_out, mock_out_store_directory, ): with cwd(tempdir_factory.get()): - with pytest.raises(PreCommitSystemExit): + with pytest.raises(SystemExit): main.main([]) assert cap_out.get() == ( 'An error has occurred: FatalError: git failed. '