paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

errors tests: Deduplicate and isolate the magical part.

Browse Source 
This makes the tests look a lot more boring and straightforward, in
addition to being a bit shorter.
This commit is contained in:
Greg Price
2017-11-30 17:32:02 -08:00
committed by Steve Howell
parent de5c944980
commit ac6f3373b6
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
zerver/tests/test_logging_handlers.py
View File

@@ -72,15 +72,7 @@ class AdminNotifyHandlerTest(ZulipTestCase):
'message', {}, exc_info) 'message', {}, exc_info)
handler.emit(record) handler.emit(record)
def run_handler(self, record: logging.LogRecord) -> Dict[str, Any]: def simulate_error(self) -> logging.LogRecord:
with patch('zerver.lib.error_notify.notify_server_error') as patched_notify:
self.handler.emit(record)
patched_notify.assert_called_once()
return patched_notify.call_args[0][0]
def test_long_exception_request(self) -> None:
"""A request with with no stack where report.getMessage() has newlines
in it is handled properly"""
email = self.example_email('hamlet') email = self.example_email('hamlet')
self.login(email) self.login(email)
with patch("zerver.decorator.rate_limit") as rate_limit_patch: with patch("zerver.decorator.rate_limit") as rate_limit_patch:
@@ -89,12 +81,22 @@ class AdminNotifyHandlerTest(ZulipTestCase):
self.assert_json_error(result, "Internal server error", status_code=500) self.assert_json_error(result, "Internal server error", status_code=500)
rate_limit_patch.assert_called_once() rate_limit_patch.assert_called_once()
global captured_request record = self.logger.makeRecord('name', logging.ERROR, 'function', 15,
global captured_exc_info 'message', {}, captured_exc_info)
record = self.logger.makeRecord('name', logging.ERROR, 'function', 15, record.request = captured_request # type: ignore # this field is dynamically added
'message\nmoremesssage\nmore', {}, return record
None)
record.request = captured_request # type: ignore # this field is dynamically added def run_handler(self, record: logging.LogRecord) -> Dict[str, Any]:
with patch('zerver.lib.error_notify.notify_server_error') as patched_notify:
self.handler.emit(record)
patched_notify.assert_called_once()
return patched_notify.call_args[0][0]
def test_long_exception_request(self) -> None:
"""A request with no stack and multi-line report.getMessage() is handled properly"""
record = self.simulate_error()
record.exc_info = None
record.msg = 'message\nmoremesssage\nmore'
report = self.run_handler(record) report = self.run_handler(record)
self.assertIn("user_email", report) self.assertIn("user_email", report)
@@ -105,19 +107,7 @@ class AdminNotifyHandlerTest(ZulipTestCase):
def test_request(self) -> None: def test_request(self) -> None:
"""A normal request is handled properly""" """A normal request is handled properly"""
email = self.example_email('hamlet') record = self.simulate_error()
self.login(email)
with patch("zerver.decorator.rate_limit") as rate_limit_patch:
rate_limit_patch.side_effect = capture_and_throw
result = self.client_get("/json/users")
self.assert_json_error(result, "Internal server error", status_code=500)
rate_limit_patch.assert_called_once()
global captured_request
global captured_exc_info
record = self.logger.makeRecord('name', logging.ERROR, 'function', 15,
'message', {}, captured_exc_info)
record.request = captured_request # type: ignore # this field is dynamically added
report = self.run_handler(record) report = self.run_handler(record)
self.assertIn("user_email", report) self.assertIn("user_email", report)