Skip to content

Commit a352e16

Browse files
methanemethane
committed
fixup
1 parent c4d3326 commit a352e16

File tree

2 files changed

+45
-43
lines changed

2 files changed

+45
-43
lines changed

‎tests/test_asynchandler.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
from tests import mockserver
2121

2222

23+
def get_logger(name, level=logging.INFO):
24+
logger = logging.getLogger(name)
25+
logger.setLevel(level)
26+
return logger
27+
28+
2329
class TestHandler(unittest.TestCase):
2430
def setUp(self):
2531
super(TestHandler, self).setUp()
@@ -36,16 +42,11 @@ def get_handler_class(self):
3642
def get_data(self):
3743
return self._server.get_received()
3844

39-
def get_logger(self, name, level=logging.INFO):
40-
logger = logging.getLogger(name)
41-
logger.setLevel(level)
42-
return logger
43-
4445
def test_simple(self):
4546
handler = self.get_handler_class()('app.follow', port=self._port)
4647

4748
with handler:
48-
log = self.get_logger('fluent.test')
49+
log = get_logger('fluent.test')
4950
handler.setFormatter(fluent.handler.FluentRecordFormatter())
5051
log.addHandler(handler)
5152
log.info({
@@ -67,7 +68,7 @@ def test_custom_fmt(self):
6768
handler = self.get_handler_class()('app.follow', port=self._port)
6869

6970
with handler:
70-
log = self.get_logger('fluent.test')
71+
log = get_logger('fluent.test')
7172
handler.setFormatter(
7273
fluent.handler.FluentRecordFormatter(fmt={
7374
'name': '%(name)s',
@@ -89,7 +90,7 @@ def test_custom_fmt_with_format_style(self):
8990
handler = self.get_handler_class()('app.follow', port=self._port)
9091

9192
with handler:
92-
log = self.get_logger('fluent.test')
93+
log = get_logger('fluent.test')
9394
handler.setFormatter(
9495
fluent.handler.FluentRecordFormatter(fmt={
9596
'name': '{name}',
@@ -111,7 +112,7 @@ def test_custom_fmt_with_template_style(self):
111112
handler = self.get_handler_class()('app.follow', port=self._port)
112113

113114
with handler:
114-
log = self.get_logger('fluent.test')
115+
log = get_logger('fluent.test')
115116
handler.setFormatter(
116117
fluent.handler.FluentRecordFormatter(fmt={
117118
'name': '${name}',
@@ -132,7 +133,7 @@ def test_custom_field_raise_exception(self):
132133
handler = self.get_handler_class()('app.follow', port=self._port)
133134

134135
with handler:
135-
log = self.get_logger('fluent.test')
136+
log = get_logger('fluent.test')
136137
handler.setFormatter(
137138
fluent.handler.FluentRecordFormatter(fmt={
138139
'name': '%(name)s',
@@ -147,7 +148,7 @@ def test_custom_field_raise_exception(self):
147148
def test_custom_field_fill_missing_fmt_key_is_true(self):
148149
handler = self.get_handler_class()('app.follow', port=self._port)
149150
with handler:
150-
log = self.get_logger('fluent.test')
151+
log = get_logger('fluent.test')
151152
handler.setFormatter(
152153
fluent.handler.FluentRecordFormatter(fmt={
153154
'name': '%(name)s',
@@ -171,7 +172,7 @@ def test_json_encoded_message(self):
171172
handler = self.get_handler_class()('app.follow', port=self._port)
172173

173174
with handler:
174-
log = self.get_logger('fluent.test')
175+
log = get_logger('fluent.test')
175176
handler.setFormatter(fluent.handler.FluentRecordFormatter())
176177
log.addHandler(handler)
177178
log.info('{"key": "hello world!", "param": "value"}')
@@ -184,7 +185,7 @@ def test_unstructured_message(self):
184185
handler = self.get_handler_class()('app.follow', port=self._port)
185186

186187
with handler:
187-
log = self.get_logger('fluent.test')
188+
log = get_logger('fluent.test')
188189
handler.setFormatter(fluent.handler.FluentRecordFormatter())
189190
log.addHandler(handler)
190191
log.info('hello %s', 'world')
@@ -197,7 +198,7 @@ def test_unstructured_formatted_message(self):
197198
handler = self.get_handler_class()('app.follow', port=self._port)
198199

199200
with handler:
200-
log = self.get_logger('fluent.test')
201+
log = get_logger('fluent.test')
201202
handler.setFormatter(fluent.handler.FluentRecordFormatter())
202203
log.addHandler(handler)
203204
log.info('hello world, %s', 'you!')
@@ -210,7 +211,7 @@ def test_number_string_simple_message(self):
210211
handler = self.get_handler_class()('app.follow', port=self._port)
211212

212213
with handler:
213-
log = self.get_logger('fluent.test')
214+
log = get_logger('fluent.test')
214215
handler.setFormatter(fluent.handler.FluentRecordFormatter())
215216
log.addHandler(handler)
216217
log.info("1")
@@ -222,7 +223,7 @@ def test_non_string_simple_message(self):
222223
handler = self.get_handler_class()('app.follow', port=self._port)
223224

224225
with handler:
225-
log = self.get_logger('fluent.test')
226+
log = get_logger('fluent.test')
226227
handler.setFormatter(fluent.handler.FluentRecordFormatter())
227228
log.addHandler(handler)
228229
log.info(42)
@@ -234,7 +235,7 @@ def test_non_string_dict_message(self):
234235
handler = self.get_handler_class()('app.follow', port=self._port)
235236

236237
with handler:
237-
log = self.get_logger('fluent.test')
238+
log = get_logger('fluent.test')
238239
handler.setFormatter(fluent.handler.FluentRecordFormatter())
239240
log.addHandler(handler)
240241
log.info({42: 'root'})
@@ -247,7 +248,7 @@ def test_exception_message(self):
247248
handler = self.get_handler_class()('app.follow', port=self._port)
248249

249250
with handler:
250-
log = self.get_logger('fluent.test')
251+
log = get_logger('fluent.test')
251252
handler.setFormatter(fluent.handler.FluentRecordFormatter())
252253
log.addHandler(handler)
253254
try:
@@ -289,7 +290,7 @@ def test_simple(self):
289290
self.assertEqual(handler.sender.queue_circular, True)
290291
self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE)
291292

292-
log = self.get_logger('fluent.test')
293+
log = get_logger('fluent.test')
293294
handler.setFormatter(fluent.handler.FluentRecordFormatter())
294295
log.addHandler(handler)
295296
log.info({'cnt': 1, 'from': 'userA', 'to': 'userB'})
@@ -350,7 +351,7 @@ def custom_full_queue():
350351
self.assertEqual(handler.sender.queue_circular, True)
351352
self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE)
352353

353-
log = self.get_logger('fluent.test')
354+
log = get_logger('fluent.test')
354355
handler.setFormatter(fluent.handler.FluentRecordFormatter())
355356
log.addHandler(handler)
356357

‎tests/test_handler.py

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
from tests import mockserver
99

1010

11+
def get_logger(name, level=logging.INFO):
12+
logger = logging.getLogger(name)
13+
logger.setLevel(level)
14+
return logger
15+
16+
1117
class TestHandler(unittest.TestCase):
1218
def setUp(self):
1319
super(TestHandler, self).setUp()
@@ -20,16 +26,11 @@ def tearDown(self):
2026
def get_data(self):
2127
return self._server.get_received()
2228

23-
def get_logger(self, name, level=logging.INFO):
24-
logger = logging.getLogger(name)
25-
logger.setLevel(level)
26-
return logger
27-
2829
def test_simple(self):
2930
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
3031

3132
with handler:
32-
log = self.get_logger('fluent.test')
33+
log = get_logger('fluent.test')
3334
handler.setFormatter(fluent.handler.FluentRecordFormatter())
3435
log.addHandler(handler)
3536

@@ -54,7 +55,7 @@ def test_custom_fmt(self):
5455
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
5556

5657
with handler:
57-
log = self.get_logger('fluent.test')
58+
log = get_logger('fluent.test')
5859
handler.setFormatter(
5960
fluent.handler.FluentRecordFormatter(fmt={
6061
'name': '%(name)s',
@@ -76,7 +77,7 @@ def test_exclude_attrs(self):
7677
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
7778

7879
with handler:
79-
log = self.get_logger('fluent.test')
80+
log = get_logger('fluent.test')
8081
handler.setFormatter(
8182
fluent.handler.FluentRecordFormatter(exclude_attrs=[])
8283
)
@@ -93,7 +94,7 @@ def test_exclude_attrs_with_exclusion(self):
9394
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
9495

9596
with handler:
96-
log = self.get_logger('fluent.test')
97+
log = get_logger('fluent.test')
9798
handler.setFormatter(
9899
fluent.handler.FluentRecordFormatter(exclude_attrs=["funcName"])
99100
)
@@ -110,7 +111,7 @@ def test_exclude_attrs_with_extra(self):
110111
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
111112

112113
with handler:
113-
log = self.get_logger('fluent.test')
114+
log = get_logger('fluent.test')
114115
handler.setFormatter(
115116
fluent.handler.FluentRecordFormatter(exclude_attrs=[])
116117
)
@@ -138,7 +139,7 @@ def formatter(record):
138139
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
139140

140141
with handler:
141-
log = self.get_logger('fluent.test')
142+
log = get_logger('fluent.test')
142143
handler.setFormatter(
143144
fluent.handler.FluentRecordFormatter(fmt=formatter)
144145
)
@@ -156,7 +157,7 @@ def test_custom_fmt_with_format_style(self):
156157
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
157158

158159
with handler:
159-
log = self.get_logger('fluent.test')
160+
log = get_logger('fluent.test')
160161
handler.setFormatter(
161162
fluent.handler.FluentRecordFormatter(fmt={
162163
'name': '{name}',
@@ -179,7 +180,7 @@ def test_custom_fmt_with_template_style(self):
179180
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
180181

181182
with handler:
182-
log = self.get_logger('fluent.test')
183+
log = get_logger('fluent.test')
183184
handler.setFormatter(
184185
fluent.handler.FluentRecordFormatter(fmt={
185186
'name': '${name}',
@@ -201,7 +202,7 @@ def test_custom_field_raise_exception(self):
201202
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
202203

203204
with handler:
204-
log = self.get_logger('fluent.test')
205+
log = get_logger('fluent.test')
205206
handler.setFormatter(
206207
fluent.handler.FluentRecordFormatter(fmt={
207208
'name': '%(name)s',
@@ -219,7 +220,7 @@ def test_custom_field_fill_missing_fmt_key_is_true(self):
219220
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
220221

221222
with handler:
222-
log = self.get_logger('fluent.test')
223+
log = get_logger('fluent.test')
223224
handler.setFormatter(
224225
fluent.handler.FluentRecordFormatter(fmt={
225226
'name': '%(name)s',
@@ -243,7 +244,7 @@ def test_json_encoded_message(self):
243244
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
244245

245246
with handler:
246-
log = self.get_logger('fluent.test')
247+
log = get_logger('fluent.test')
247248
handler.setFormatter(fluent.handler.FluentRecordFormatter())
248249
log.addHandler(handler)
249250

@@ -259,7 +260,7 @@ def test_json_encoded_message_without_json(self):
259260
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
260261

261262
with handler:
262-
log = self.get_logger('fluent.test')
263+
log = get_logger('fluent.test')
263264
handler.setFormatter(fluent.handler.FluentRecordFormatter(format_json=False))
264265
log.addHandler(handler)
265266

@@ -275,7 +276,7 @@ def test_unstructured_message(self):
275276
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
276277

277278
with handler:
278-
log = self.get_logger('fluent.test')
279+
log = get_logger('fluent.test')
279280
handler.setFormatter(fluent.handler.FluentRecordFormatter())
280281
log.addHandler(handler)
281282
log.info('hello %s', 'world')
@@ -289,7 +290,7 @@ def test_unstructured_formatted_message(self):
289290
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
290291

291292
with handler:
292-
log = self.get_logger('fluent.test')
293+
log = get_logger('fluent.test')
293294
handler.setFormatter(fluent.handler.FluentRecordFormatter())
294295
log.addHandler(handler)
295296
log.info('hello world, %s', 'you!')
@@ -303,7 +304,7 @@ def test_number_string_simple_message(self):
303304
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
304305

305306
with handler:
306-
log = self.get_logger('fluent.test')
307+
log = get_logger('fluent.test')
307308
handler.setFormatter(fluent.handler.FluentRecordFormatter())
308309
log.addHandler(handler)
309310
log.info("1")
@@ -316,7 +317,7 @@ def test_non_string_simple_message(self):
316317
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
317318

318319
with handler:
319-
log = self.get_logger('fluent.test')
320+
log = get_logger('fluent.test')
320321
handler.setFormatter(fluent.handler.FluentRecordFormatter())
321322
log.addHandler(handler)
322323
log.info(42)
@@ -329,7 +330,7 @@ def test_non_string_dict_message(self):
329330
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
330331

331332
with handler:
332-
log = self.get_logger('fluent.test')
333+
log = get_logger('fluent.test')
333334
handler.setFormatter(fluent.handler.FluentRecordFormatter())
334335
log.addHandler(handler)
335336
log.info({42: 'root'})
@@ -343,7 +344,7 @@ def test_exception_message(self):
343344
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
344345

345346
with handler:
346-
log = self.get_logger('fluent.test')
347+
log = get_logger('fluent.test')
347348
handler.setFormatter(fluent.handler.FluentRecordFormatter())
348349
log.addHandler(handler)
349350
try:

0 commit comments

Comments
 (0)