Skip to content

Commit 9ecf78c

Browse files
committed
Support pytest 6
1 parent 3306656 commit 9ecf78c

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

tests/test_formatter.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,38 @@
44

55
import logging_json
66

7-
logging.basicConfig(level=logging.DEBUG)
8-
97

108
class MyException(Exception):
119
pass
1210

1311

1412
def test_empty_dict_message(caplog):
13+
caplog.set_level("INFO")
1514
logging.info({})
1615
assert fmt(caplog) == "{}"
1716

1817

1918
def test_dict_message(caplog):
19+
caplog.set_level("INFO")
2020
logging.info({"key 1": "value 1", "key 2": 2})
2121
assert fmt(caplog) == '{"key 1": "value 1", "key 2": 2}'
2222

2323

2424
def test_str_message(caplog):
25+
caplog.set_level("INFO")
2526
logging.info("message 1")
2627
assert fmt(caplog) == "message 1"
2728

2829

2930
def test_str_with_args_message(caplog):
31+
caplog.set_level("INFO")
3032
logging.info("message %s", "1")
3133
assert fmt(caplog) == "message 1"
3234

3335

3436
def test_dict_message_with_asctime(caplog, monkeypatch):
3537
monkeypatch.setattr(time, "time", lambda: 1599736353.0076675)
38+
caplog.set_level("INFO")
3639
logging.info({"key 1": "value 1", "key 2": 2})
3740
actual = dict_fmt(caplog, fields={"date_time": "asctime"})
3841
assert time.strptime(actual.pop("date_time"), "%Y-%m-%d %H:%M:%S,007")
@@ -41,6 +44,7 @@ def test_dict_message_with_asctime(caplog, monkeypatch):
4144

4245
def test_str_message_with_asctime(caplog, monkeypatch):
4346
monkeypatch.setattr(time, "time", lambda: 1599736353.0076675)
47+
caplog.set_level("INFO")
4448
logging.info("message 1")
4549
actual = dict_fmt(caplog, fields={"date_time": "asctime"})
4650
assert time.strptime(actual.pop("date_time"), "%Y-%m-%d %H:%M:%S,007")
@@ -49,13 +53,15 @@ def test_str_message_with_asctime(caplog, monkeypatch):
4953

5054
def test_str_with_args_message_with_asctime(caplog, monkeypatch):
5155
monkeypatch.setattr(time, "time", lambda: 1599736353.0076675)
56+
caplog.set_level("INFO")
5257
logging.info("message %s", "1")
5358
actual = dict_fmt(caplog, fields={"date_time": "asctime"})
5459
assert time.strptime(actual.pop("date_time"), "%Y-%m-%d %H:%M:%S,007")
5560
assert actual == {"msg": "message 1"}
5661

5762

5863
def test_dict_message_at_exception_level(caplog):
64+
caplog.set_level("INFO")
5965
try:
6066
raise MyException("this is the exception message")
6167
except MyException:
@@ -73,6 +79,7 @@ def test_dict_message_at_exception_level(caplog):
7379

7480

7581
def test_str_message_at_exception_level(caplog):
82+
caplog.set_level("INFO")
7683
try:
7784
raise MyException("this is the exception message")
7885
except MyException:
@@ -89,6 +96,7 @@ def test_str_message_at_exception_level(caplog):
8996

9097

9198
def test_str_with_args_message_at_exception_level(caplog):
99+
caplog.set_level("INFO")
92100
try:
93101
raise MyException("this is the exception message")
94102
except MyException:
@@ -106,6 +114,7 @@ def test_str_with_args_message_at_exception_level(caplog):
106114

107115
def test_documented_record_attributes(caplog, monkeypatch):
108116
monkeypatch.setattr(time, "time", lambda: 1599736353.0076675)
117+
caplog.set_level("INFO")
109118
logging.info({})
110119
actual = dict_fmt(
111120
caplog,

0 commit comments

Comments
 (0)