From 7fef40dd83cea3c4fcd2372a2ae637a699c9a703 Mon Sep 17 00:00:00 2001 From: Nitsan Avni Date: Wed, 11 Dec 2024 18:30:15 +0100 Subject: [PATCH] - F more date scrubber --- approvaltests/scrubbers/date_scrubber.py | 4 ++-- ..._date_scrubber.test_supported_formats_as_table.approved.md | 2 +- .../test_date_scrubber.test_unsupported_format.approved.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/approvaltests/scrubbers/date_scrubber.py b/approvaltests/scrubbers/date_scrubber.py index 3beb5b1..d99ed26 100644 --- a/approvaltests/scrubbers/date_scrubber.py +++ b/approvaltests/scrubbers/date_scrubber.py @@ -53,8 +53,8 @@ def get_supported_formats(): ["2020-09-10T01:23:45.678Z"], ), ( - "\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{2}\\:\\d{2}\\.\\d{6}", - ["2023-07-16 17:39:03.293919"], + r"\d{4}-\d{1,2}-\d{1,2}(?:T| )\d{1,2}:\d{2}:\d{2}\.\d{6}", + ["2023-07-16 17:39:03.293919", "2023-12-06T11:59:47.090226"], ), ("\\d{8}T\\d{6}Z", ["20210505T091112Z"]), ( diff --git a/tests/scrubbers/test_date_scrubber.test_supported_formats_as_table.approved.md b/tests/scrubbers/test_date_scrubber.test_supported_formats_as_table.approved.md index 5d86c34..5f3cb25 100644 --- a/tests/scrubbers/test_date_scrubber.test_supported_formats_as_table.approved.md +++ b/tests/scrubbers/test_date_scrubber.test_supported_formats_as_table.approved.md @@ -11,7 +11,7 @@ | 2020-9-10T08:07Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}Z | | 2020-09-10T08:07:89Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}Z | | 2020-09-10T01:23:45.678Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}\:\d{2}\.\d{3}Z | -| 2023-07-16 17:39:03.293919 | \d{4}-\d{1,2}-\d{1,2} \d{1,2}:\d{2}\:\d{2}\.\d{6} | +| 2023-07-16 17:39:03.293919 | \d{4}-\d{1,2}-\d{1,2}(?:T| )\d{1,2}:\d{2}:\d{2}\.\d{6} | | 20210505T091112Z | \d{8}T\d{6}Z | | Tue May 13 16:30:00 2014 | (Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s([0-3]?\d)\s([0-1]\d:[0-5]\d:[0-5]\d)\s(\d{4}) | | 2021-09-10T08:07:00+03:00 | \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} | diff --git a/tests/scrubbers/test_date_scrubber.test_unsupported_format.approved.txt b/tests/scrubbers/test_date_scrubber.test_unsupported_format.approved.txt index b6ed7b2..ad7c5f4 100644 --- a/tests/scrubbers/test_date_scrubber.test_unsupported_format.approved.txt +++ b/tests/scrubbers/test_date_scrubber.test_unsupported_format.approved.txt @@ -12,7 +12,7 @@ Exception: No match found for 'an unsupported format'. 2020-9-10T08:07Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}Z 2020-09-10T08:07:89Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}Z 2020-09-10T01:23:45.678Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}\:\d{2}\.\d{3}Z - 2023-07-16 17:39:03.293919 | \d{4}-\d{1,2}-\d{1,2} \d{1,2}:\d{2}\:\d{2}\.\d{6} + 2023-07-16 17:39:03.293919 | \d{4}-\d{1,2}-\d{1,2}(?:T| )\d{1,2}:\d{2}:\d{2}\.\d{6} 20210505T091112Z | \d{8}T\d{6}Z Tue May 13 16:30:00 2014 | (Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s([0-3]?\d)\s([0-1]\d:[0-5]\d:[0-5]\d)\s(\d{4}) 2021-09-10T08:07:00+03:00 | \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}