Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix incorrect reference to StringIO #3168

Merged
merged 1 commit into from
May 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion synapse/util/logformatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def __init__(self, *args, **kwargs):
super(LogFormatter, self).__init__(*args, **kwargs)

def formatException(self, ei):
sio = StringIO.StringIO()
sio = StringIO()
(typ, val, tb) = ei

# log the stack above the exception capture point if possible, but
Expand Down
38 changes: 38 additions & 0 deletions tests/util/test_logformatter.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
# Copyright 2018 New Vector Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import sys

from synapse.util.logformatter import LogFormatter
from tests import unittest


class TestException(Exception):
pass


class LogFormatterTestCase(unittest.TestCase):
def test_formatter(self):
formatter = LogFormatter()

try:
raise TestException("testytest")
except TestException:
ei = sys.exc_info()

output = formatter.formatException(ei)

# check the output looks vaguely sane
self.assertIn("testytest", output)
self.assertIn("Capture point", output)