From 79df496212fb90d2a1359c0a5aec2604ff1fab19 Mon Sep 17 00:00:00 2001 From: ptmcg Date: Sat, 28 Sep 2024 13:01:51 -0500 Subject: [PATCH] Fix typos in tests; verify test matches expected test transformer with test timestamp string --- logmerger/timestamp_wrapper.py | 2 +- tests/test_timestamp_formats.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/logmerger/timestamp_wrapper.py b/logmerger/timestamp_wrapper.py index 817e4b9..fbd4772 100644 --- a/logmerger/timestamp_wrapper.py +++ b/logmerger/timestamp_wrapper.py @@ -205,7 +205,7 @@ class YMDHMSZ(TimestampedLineTransformer): # log files with timestamp "YYYY-MM-DD HH:MM:SS" timestamp_pattern = r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\s?(?:Z|[+-]\d{4})" pattern = fr"(({timestamp_pattern})\s)" - strptime_format = datetime.fromisoformat + strptime_format = lambda _, s: datetime.strptime(s, "%Y-%m-%d %H:%M:%S%z") has_timezone = True def __init__(self): diff --git a/tests/test_timestamp_formats.py b/tests/test_timestamp_formats.py index 26c8f95..4eb126f 100644 --- a/tests/test_timestamp_formats.py +++ b/tests/test_timestamp_formats.py @@ -7,11 +7,14 @@ local_tz = local_time.tzinfo -def _test_timestamp_format_parsing(string_date: str, expected_datetime: datetime): +def _test_timestamp_format_parsing(string_date: str, expected_transformer_class_name: str, expected_datetime: datetime) -> None: transformer = TimestampedLineTransformer.make_transformer_from_sample_line( string_date ) + # assert that we got the expected transformer + assert type(transformer).__name__ == expected_transformer_class_name + try: parsed_datetime, _ = transformer(string_date) except ValueError as ve: @@ -62,12 +65,12 @@ def _test_timestamp_format_parsing(string_date: str, expected_datetime: datetime ), ( "YMDHMSZ", - "2023-07-14T08:00:01Z Log", + "2023-07-14 08:00:01Z Log", datetime(2023, 7, 14, 8, 0, 1, tzinfo=timezone.utc), ), ( "YMDHMSZ", - "2023-07-14T08:00:01+0200 Log", + "2023-07-14 08:00:01+0200 Log", datetime(2023, 7, 14, 8, 0, 1, tzinfo=timezone(timedelta(hours=2))), ), ( @@ -154,4 +157,4 @@ def _test_timestamp_format_parsing(string_date: str, expected_datetime: datetime ], ) def test_timestamp_format_parsing(tz_class: str, string_date: str, expected_datetime: datetime): - _test_timestamp_format_parsing(string_date, expected_datetime) + _test_timestamp_format_parsing(string_date, tz_class, expected_datetime)