From 6ab01430fb5faa8ec61dba4f0f62d498eed4dca3 Mon Sep 17 00:00:00 2001 From: int3l Date: Wed, 16 Sep 2020 23:41:43 +0300 Subject: [PATCH] Fix merge conflict --- tests/error_handler_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/error_handler_test.py b/tests/error_handler_test.py index c15f732c..02148a45 100644 --- a/tests/error_handler_test.py +++ b/tests/error_handler_test.py @@ -107,7 +107,7 @@ def test_log_and_exit(cap_out, mock_store_dir): with pytest.raises(SystemExit): 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()