Skip to content

Commit d2bae5e

Browse files
methanemethane
committed
fix tests on pytest
Signed-off-by: Inada Naoki <songofacandy@gmail.com>
1 parent c74061d commit d2bae5e

File tree

5 files changed

+10
-40
lines changed

5 files changed

+10
-40
lines changed

‎tests/mockserver.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,3 @@ def close(self):
9292
pass
9393

9494
self.join()
95-
96-
def __del__(self):
97-
self.close()

‎tests/test_asynchandler.py

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ def setUp(self):
2525
super(TestHandler, self).setUp()
2626
self._server = mockserver.MockRecvServer('localhost')
2727
self._port = self._server.port
28+
logging.getLogger().setLevel(logging.INFO)
2829

2930
def tearDown(self):
3031
self._server.close()
32+
self._server = None
3133

3234
def get_handler_class(self):
3335
# return fluent.handler.FluentHandler
@@ -40,7 +42,6 @@ def test_simple(self):
4042
handler = self.get_handler_class()('app.follow', port=self._port)
4143

4244
with handler:
43-
logging.basicConfig(level=logging.INFO)
4445
log = logging.getLogger('fluent.test')
4546
handler.setFormatter(fluent.handler.FluentRecordFormatter())
4647
log.addHandler(handler)
@@ -63,7 +64,6 @@ def test_custom_fmt(self):
6364
handler = self.get_handler_class()('app.follow', port=self._port)
6465

6566
with handler:
66-
logging.basicConfig(level=logging.INFO)
6767
log = logging.getLogger('fluent.test')
6868
handler.setFormatter(
6969
fluent.handler.FluentRecordFormatter(fmt={
@@ -86,7 +86,6 @@ def test_custom_fmt_with_format_style(self):
8686
handler = self.get_handler_class()('app.follow', port=self._port)
8787

8888
with handler:
89-
logging.basicConfig(level=logging.INFO)
9089
log = logging.getLogger('fluent.test')
9190
handler.setFormatter(
9291
fluent.handler.FluentRecordFormatter(fmt={
@@ -109,7 +108,6 @@ def test_custom_fmt_with_template_style(self):
109108
handler = self.get_handler_class()('app.follow', port=self._port)
110109

111110
with handler:
112-
logging.basicConfig(level=logging.INFO)
113111
log = logging.getLogger('fluent.test')
114112
handler.setFormatter(
115113
fluent.handler.FluentRecordFormatter(fmt={
@@ -131,7 +129,6 @@ def test_custom_field_raise_exception(self):
131129
handler = self.get_handler_class()('app.follow', port=self._port)
132130

133131
with handler:
134-
logging.basicConfig(level=logging.INFO)
135132
log = logging.getLogger('fluent.test')
136133
handler.setFormatter(
137134
fluent.handler.FluentRecordFormatter(fmt={
@@ -147,7 +144,6 @@ def test_custom_field_raise_exception(self):
147144
def test_custom_field_fill_missing_fmt_key_is_true(self):
148145
handler = self.get_handler_class()('app.follow', port=self._port)
149146
with handler:
150-
logging.basicConfig(level=logging.INFO)
151147
log = logging.getLogger('fluent.test')
152148
handler.setFormatter(
153149
fluent.handler.FluentRecordFormatter(fmt={
@@ -172,7 +168,6 @@ def test_json_encoded_message(self):
172168
handler = self.get_handler_class()('app.follow', port=self._port)
173169

174170
with handler:
175-
logging.basicConfig(level=logging.INFO)
176171
log = logging.getLogger('fluent.test')
177172
handler.setFormatter(fluent.handler.FluentRecordFormatter())
178173
log.addHandler(handler)
@@ -186,7 +181,6 @@ def test_unstructured_message(self):
186181
handler = self.get_handler_class()('app.follow', port=self._port)
187182

188183
with handler:
189-
logging.basicConfig(level=logging.INFO)
190184
log = logging.getLogger('fluent.test')
191185
handler.setFormatter(fluent.handler.FluentRecordFormatter())
192186
log.addHandler(handler)
@@ -200,7 +194,6 @@ def test_unstructured_formatted_message(self):
200194
handler = self.get_handler_class()('app.follow', port=self._port)
201195

202196
with handler:
203-
logging.basicConfig(level=logging.INFO)
204197
log = logging.getLogger('fluent.test')
205198
handler.setFormatter(fluent.handler.FluentRecordFormatter())
206199
log.addHandler(handler)
@@ -214,7 +207,6 @@ def test_number_string_simple_message(self):
214207
handler = self.get_handler_class()('app.follow', port=self._port)
215208

216209
with handler:
217-
logging.basicConfig(level=logging.INFO)
218210
log = logging.getLogger('fluent.test')
219211
handler.setFormatter(fluent.handler.FluentRecordFormatter())
220212
log.addHandler(handler)
@@ -227,7 +219,6 @@ def test_non_string_simple_message(self):
227219
handler = self.get_handler_class()('app.follow', port=self._port)
228220

229221
with handler:
230-
logging.basicConfig(level=logging.INFO)
231222
log = logging.getLogger('fluent.test')
232223
handler.setFormatter(fluent.handler.FluentRecordFormatter())
233224
log.addHandler(handler)
@@ -240,7 +231,6 @@ def test_non_string_dict_message(self):
240231
handler = self.get_handler_class()('app.follow', port=self._port)
241232

242233
with handler:
243-
logging.basicConfig(level=logging.INFO)
244234
log = logging.getLogger('fluent.test')
245235
handler.setFormatter(fluent.handler.FluentRecordFormatter())
246236
log.addHandler(handler)
@@ -254,7 +244,6 @@ def test_exception_message(self):
254244
handler = self.get_handler_class()('app.follow', port=self._port)
255245

256246
with handler:
257-
logging.basicConfig(level=logging.INFO)
258247
log = logging.getLogger('fluent.test')
259248
handler.setFormatter(fluent.handler.FluentRecordFormatter())
260249
log.addHandler(handler)
@@ -297,7 +286,6 @@ def test_simple(self):
297286
self.assertEqual(handler.sender.queue_circular, True)
298287
self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE)
299288

300-
logging.basicConfig(level=logging.INFO)
301289
log = logging.getLogger('fluent.test')
302290
handler.setFormatter(fluent.handler.FluentRecordFormatter())
303291
log.addHandler(handler)
@@ -359,7 +347,6 @@ def custom_full_queue():
359347
self.assertEqual(handler.sender.queue_circular, True)
360348
self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE)
361349

362-
logging.basicConfig(level=logging.INFO)
363350
log = logging.getLogger('fluent.test')
364351
handler.setFormatter(fluent.handler.FluentRecordFormatter())
365352
log.addHandler(handler)

‎tests/test_event.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from tests import mockserver
77

88

9-
class TestException(BaseException): pass
9+
class TestException(BaseException):
10+
__test__ = False
1011

1112

1213
class TestEvent(unittest.TestCase):

‎tests/test_handler.py

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ def setUp(self):
1313
super(TestHandler, self).setUp()
1414
self._server = mockserver.MockRecvServer('localhost')
1515
self._port = self._server.port
16+
logging.getLogger().setLevel(logging.INFO)
1617

1718
def tearDown(self):
1819
self._server.close()
20+
self._server = None
1921

2022
def get_data(self):
2123
return self._server.get_received()
@@ -24,7 +26,6 @@ def test_simple(self):
2426
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
2527

2628
with handler:
27-
logging.basicConfig(level=logging.INFO)
2829
log = logging.getLogger('fluent.test')
2930
handler.setFormatter(fluent.handler.FluentRecordFormatter())
3031
log.addHandler(handler)
@@ -50,7 +51,6 @@ def test_custom_fmt(self):
5051
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
5152

5253
with handler:
53-
logging.basicConfig(level=logging.INFO)
5454
log = logging.getLogger('fluent.test')
5555
handler.setFormatter(
5656
fluent.handler.FluentRecordFormatter(fmt={
@@ -73,7 +73,6 @@ def test_exclude_attrs(self):
7373
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
7474

7575
with handler:
76-
logging.basicConfig(level=logging.INFO)
7776
log = logging.getLogger('fluent.test')
7877
handler.setFormatter(
7978
fluent.handler.FluentRecordFormatter(exclude_attrs=[])
@@ -91,7 +90,6 @@ def test_exclude_attrs_with_exclusion(self):
9190
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
9291

9392
with handler:
94-
logging.basicConfig(level=logging.INFO)
9593
log = logging.getLogger('fluent.test')
9694
handler.setFormatter(
9795
fluent.handler.FluentRecordFormatter(exclude_attrs=["funcName"])
@@ -109,7 +107,6 @@ def test_exclude_attrs_with_extra(self):
109107
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
110108

111109
with handler:
112-
logging.basicConfig(level=logging.INFO)
113110
log = logging.getLogger('fluent.test')
114111
handler.setFormatter(
115112
fluent.handler.FluentRecordFormatter(exclude_attrs=[])
@@ -138,7 +135,6 @@ def formatter(record):
138135
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
139136

140137
with handler:
141-
logging.basicConfig(level=logging.INFO)
142138
log = logging.getLogger('fluent.test')
143139
handler.setFormatter(
144140
fluent.handler.FluentRecordFormatter(fmt=formatter)
@@ -157,7 +153,6 @@ def test_custom_fmt_with_format_style(self):
157153
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
158154

159155
with handler:
160-
logging.basicConfig(level=logging.INFO)
161156
log = logging.getLogger('fluent.test')
162157
handler.setFormatter(
163158
fluent.handler.FluentRecordFormatter(fmt={
@@ -181,7 +176,6 @@ def test_custom_fmt_with_template_style(self):
181176
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
182177

183178
with handler:
184-
logging.basicConfig(level=logging.INFO)
185179
log = logging.getLogger('fluent.test')
186180
handler.setFormatter(
187181
fluent.handler.FluentRecordFormatter(fmt={
@@ -204,7 +198,6 @@ def test_custom_field_raise_exception(self):
204198
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
205199

206200
with handler:
207-
logging.basicConfig(level=logging.INFO)
208201
log = logging.getLogger('fluent.test')
209202
handler.setFormatter(
210203
fluent.handler.FluentRecordFormatter(fmt={
@@ -223,7 +216,6 @@ def test_custom_field_fill_missing_fmt_key_is_true(self):
223216
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
224217

225218
with handler:
226-
logging.basicConfig(level=logging.INFO)
227219
log = logging.getLogger('fluent.test')
228220
handler.setFormatter(
229221
fluent.handler.FluentRecordFormatter(fmt={
@@ -248,7 +240,6 @@ def test_json_encoded_message(self):
248240
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
249241

250242
with handler:
251-
logging.basicConfig(level=logging.INFO)
252243
log = logging.getLogger('fluent.test')
253244
handler.setFormatter(fluent.handler.FluentRecordFormatter())
254245
log.addHandler(handler)
@@ -265,7 +256,6 @@ def test_json_encoded_message_without_json(self):
265256
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
266257

267258
with handler:
268-
logging.basicConfig(level=logging.INFO)
269259
log = logging.getLogger('fluent.test')
270260
handler.setFormatter(fluent.handler.FluentRecordFormatter(format_json=False))
271261
log.addHandler(handler)
@@ -282,7 +272,6 @@ def test_unstructured_message(self):
282272
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
283273

284274
with handler:
285-
logging.basicConfig(level=logging.INFO)
286275
log = logging.getLogger('fluent.test')
287276
handler.setFormatter(fluent.handler.FluentRecordFormatter())
288277
log.addHandler(handler)
@@ -297,7 +286,6 @@ def test_unstructured_formatted_message(self):
297286
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
298287

299288
with handler:
300-
logging.basicConfig(level=logging.INFO)
301289
log = logging.getLogger('fluent.test')
302290
handler.setFormatter(fluent.handler.FluentRecordFormatter())
303291
log.addHandler(handler)
@@ -312,7 +300,6 @@ def test_number_string_simple_message(self):
312300
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
313301

314302
with handler:
315-
logging.basicConfig(level=logging.INFO)
316303
log = logging.getLogger('fluent.test')
317304
handler.setFormatter(fluent.handler.FluentRecordFormatter())
318305
log.addHandler(handler)
@@ -326,7 +313,6 @@ def test_non_string_simple_message(self):
326313
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
327314

328315
with handler:
329-
logging.basicConfig(level=logging.INFO)
330316
log = logging.getLogger('fluent.test')
331317
handler.setFormatter(fluent.handler.FluentRecordFormatter())
332318
log.addHandler(handler)
@@ -340,7 +326,6 @@ def test_non_string_dict_message(self):
340326
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
341327

342328
with handler:
343-
logging.basicConfig(level=logging.INFO)
344329
log = logging.getLogger('fluent.test')
345330
handler.setFormatter(fluent.handler.FluentRecordFormatter())
346331
log.addHandler(handler)
@@ -355,7 +340,6 @@ def test_exception_message(self):
355340
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
356341

357342
with handler:
358-
logging.basicConfig(level=logging.INFO)
359343
log = logging.getLogger('fluent.test')
360344
handler.setFormatter(fluent.handler.FluentRecordFormatter())
361345
log.addHandler(handler)

‎tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ envlist = py27, py32, py33, py34, py35, py36, py37, py38
44
skip_missing_interpreters = True
55

66
[testenv]
7-
deps = nose
8-
coverage~=4.5.4
9-
commands = python setup.py nosetests
7+
deps =
8+
pytest
9+
msgpack
10+
commands = pytest -v

0 commit comments

Comments
 (0)