third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-04-16 02:21:46 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflict

Browse source
This commit is contained in:
int3l 2020-09-16 23:41:43 +03:00 • committed by GitHub
parent 4ef3f957e3
commit 6ab01430fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/error_handler_test.py
View file

@ -107,7 +107,7 @@ def test_log_and_exit(cap_out, mock_store_dir):
with pytest.raises(SystemExit): with pytest.raises(SystemExit):
error_handler._log_and_exit( error_handler._log_and_exit(
'msg', 1, error_handler.FatalError('hai'), "I'm a stacktrace", 'msg', 1, error_handler.FatalError('hai'), tb,
) )
printed = cap_out.get() printed = cap_out.get()