Skip to content

Commit 48f270e

Browse files
committed
Updates for pydantic tests
1 parent fa908fb commit 48f270e

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

key-value/key-value-aio/tests/adapters/test_pydantic.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ def model_type_from_log_record(record: LogRecord) -> str:
5555
return record.model_type # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType, reportAttributeAccessIssue]
5656

5757

58+
def error_from_log_record(record: LogRecord) -> str:
59+
if not hasattr(record, "error"):
60+
msg = "Log record does not have an error attribute"
61+
raise ValueError(msg)
62+
return record.error # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType, reportAttributeAccessIssue]
63+
64+
5865
def errors_from_log_record(record: LogRecord) -> list[str]:
5966
if not hasattr(record, "errors"):
6067
msg = "Log record does not have an errors attribute"
@@ -185,7 +192,7 @@ async def test_validation_error_logging(
185192

186193
errors = errors_from_log_record(record)
187194
assert len(errors) == 1
188-
assert "is_admin" in errors[0]
195+
assert "is_admin" in str(errors[0])
189196

190197
async def test_list_validation_error_logging(
191198
self, product_list_adapter: PydanticAdapter[list[Product]], store: MemoryStore, caplog: pytest.LogCaptureFixture
@@ -208,6 +215,5 @@ async def test_list_validation_error_logging(
208215
assert record.levelname == "ERROR"
209216
assert "Missing 'items' wrapper" in record.message
210217
assert model_type_from_log_record(record) == "Pydantic model"
211-
errors = errors_from_log_record(record)
212-
assert len(errors) == 1
213-
assert "missing 'items' wrapper" in errors[0]
218+
errors = error_from_log_record(record)
219+
assert "missing 'items' wrapper" in str(errors)

key-value/key-value-sync/tests/code_gen/adapters/test_pydantic.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ def model_type_from_log_record(record: LogRecord) -> str:
5858
return record.model_type # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType, reportAttributeAccessIssue]
5959

6060

61+
def error_from_log_record(record: LogRecord) -> str:
62+
if not hasattr(record, "error"):
63+
msg = "Log record does not have an error attribute"
64+
raise ValueError(msg)
65+
return record.error # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType, reportAttributeAccessIssue]
66+
67+
6168
def errors_from_log_record(record: LogRecord) -> list[str]:
6269
if not hasattr(record, "errors"):
6370
msg = "Log record does not have an errors attribute"
@@ -188,7 +195,7 @@ def test_validation_error_logging(
188195

189196
errors = errors_from_log_record(record)
190197
assert len(errors) == 1
191-
assert "is_admin" in errors[0]
198+
assert "is_admin" in str(errors[0])
192199

193200
def test_list_validation_error_logging(
194201
self, product_list_adapter: PydanticAdapter[list[Product]], store: MemoryStore, caplog: pytest.LogCaptureFixture
@@ -211,6 +218,5 @@ def test_list_validation_error_logging(
211218
assert record.levelname == "ERROR"
212219
assert "Missing 'items' wrapper" in record.message
213220
assert model_type_from_log_record(record) == "Pydantic model"
214-
errors = errors_from_log_record(record)
215-
assert len(errors) == 1
216-
assert "missing 'items' wrapper" in errors[0]
221+
errors = error_from_log_record(record)
222+
assert "missing 'items' wrapper" in str(errors)

0 commit comments

Comments
 (0)