diff --git a/tests/test_asynchandler.py b/tests/test_asynchandler.py index 859f36d..8cd2681 100644 --- a/tests/test_asynchandler.py +++ b/tests/test_asynchandler.py @@ -25,11 +25,9 @@ def setUp(self): super(TestHandler, self).setUp() self._server = mockserver.MockRecvServer('localhost') self._port = self._server.port - logging.getLogger().setLevel(logging.INFO) def tearDown(self): self._server.close() - self._server = None def get_handler_class(self): # return fluent.handler.FluentHandler @@ -38,11 +36,16 @@ def get_handler_class(self): def get_data(self): return self._server.get_received() + def get_logger(self, name, level=logging.INFO): + logger = logging.getLogger(name) + logger.setLevel(level) + return logger + def test_simple(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info({ @@ -64,7 +67,7 @@ def test_custom_fmt(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '%(name)s', @@ -86,7 +89,7 @@ def test_custom_fmt_with_format_style(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '{name}', @@ -108,7 +111,7 @@ def test_custom_fmt_with_template_style(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '${name}', @@ -129,7 +132,7 @@ def test_custom_field_raise_exception(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '%(name)s', @@ -144,7 +147,7 @@ def test_custom_field_raise_exception(self): def test_custom_field_fill_missing_fmt_key_is_true(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '%(name)s', @@ -168,7 +171,7 @@ def test_json_encoded_message(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info('{"key": "hello world!", "param": "value"}') @@ -181,7 +184,7 @@ def test_unstructured_message(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info('hello %s', 'world') @@ -194,7 +197,7 @@ def test_unstructured_formatted_message(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info('hello world, %s', 'you!') @@ -207,7 +210,7 @@ def test_number_string_simple_message(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info("1") @@ -219,7 +222,7 @@ def test_non_string_simple_message(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info(42) @@ -231,7 +234,7 @@ def test_non_string_dict_message(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info({42: 'root'}) @@ -244,7 +247,7 @@ def test_exception_message(self): handler = self.get_handler_class()('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) try: @@ -286,7 +289,7 @@ def test_simple(self): self.assertEqual(handler.sender.queue_circular, True) self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE) - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info({'cnt': 1, 'from': 'userA', 'to': 'userB'}) @@ -347,7 +350,7 @@ def custom_full_queue(): self.assertEqual(handler.sender.queue_circular, True) self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE) - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) diff --git a/tests/test_event.py b/tests/test_event.py index 9f2010f..0f47ffa 100644 --- a/tests/test_event.py +++ b/tests/test_event.py @@ -19,7 +19,7 @@ def tearDown(self): from fluent.sender import _set_global_sender sender.close() _set_global_sender(None) - + def test_logging(self): # XXX: This tests succeeds even if the fluentd connection failed # send event with tag app.follow diff --git a/tests/test_handler.py b/tests/test_handler.py index a7cdd51..7c40c07 100644 --- a/tests/test_handler.py +++ b/tests/test_handler.py @@ -13,20 +13,23 @@ def setUp(self): super(TestHandler, self).setUp() self._server = mockserver.MockRecvServer('localhost') self._port = self._server.port - logging.getLogger().setLevel(logging.INFO) def tearDown(self): self._server.close() - self._server = None def get_data(self): return self._server.get_received() + def get_logger(self, name, level=logging.INFO): + logger = logging.getLogger(name) + logger.setLevel(level) + return logger + def test_simple(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) @@ -51,7 +54,7 @@ def test_custom_fmt(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '%(name)s', @@ -73,7 +76,7 @@ def test_exclude_attrs(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(exclude_attrs=[]) ) @@ -90,7 +93,7 @@ def test_exclude_attrs_with_exclusion(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(exclude_attrs=["funcName"]) ) @@ -107,7 +110,7 @@ def test_exclude_attrs_with_extra(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(exclude_attrs=[]) ) @@ -135,7 +138,7 @@ def formatter(record): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt=formatter) ) @@ -153,7 +156,7 @@ def test_custom_fmt_with_format_style(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '{name}', @@ -176,7 +179,7 @@ def test_custom_fmt_with_template_style(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '${name}', @@ -198,7 +201,7 @@ def test_custom_field_raise_exception(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '%(name)s', @@ -216,7 +219,7 @@ def test_custom_field_fill_missing_fmt_key_is_true(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter( fluent.handler.FluentRecordFormatter(fmt={ 'name': '%(name)s', @@ -240,7 +243,7 @@ def test_json_encoded_message(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) @@ -256,7 +259,7 @@ def test_json_encoded_message_without_json(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter(format_json=False)) log.addHandler(handler) @@ -272,7 +275,7 @@ def test_unstructured_message(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info('hello %s', 'world') @@ -286,7 +289,7 @@ def test_unstructured_formatted_message(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info('hello world, %s', 'you!') @@ -300,7 +303,7 @@ def test_number_string_simple_message(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info("1") @@ -313,7 +316,7 @@ def test_non_string_simple_message(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info(42) @@ -326,7 +329,7 @@ def test_non_string_dict_message(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) log.info({42: 'root'}) @@ -340,7 +343,7 @@ def test_exception_message(self): handler = fluent.handler.FluentHandler('app.follow', port=self._port) with handler: - log = logging.getLogger('fluent.test') + log = self.get_logger('fluent.test') handler.setFormatter(fluent.handler.FluentRecordFormatter()) log.addHandler(handler) try: