From ad1a4f2410393cab6ac728c4ddb79d111e252559 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Fri, 24 Sep 2021 12:22:42 +1000 Subject: [PATCH] mgr/dashboard: More robust handling of timedelta() representation The representation of timedelta() appears to have changed recently so we should try and be more accommodating in that regard. Fixes: https://tracker.ceph.com/issues/52696 Signed-off-by: Brad Hubbard --- src/python-common/ceph/utils.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/python-common/ceph/utils.py b/src/python-common/ceph/utils.py index 89f0654aa0b8c..f5a85c4d3b7be 100644 --- a/src/python-common/ceph/utils.py +++ b/src/python-common/ceph/utils.py @@ -77,17 +77,17 @@ def parse_timedelta(delta: str) -> Optional[datetime.timedelta]: >>> parse_timedelta('foo') - >>> parse_timedelta('2d') - datetime.timedelta(days=2) + >>> parse_timedelta('2d') == datetime.timedelta(days=2) + True - >>> parse_timedelta("4w") - datetime.timedelta(days=28) + >>> parse_timedelta("4w") == datetime.timedelta(days=28) + True - >>> parse_timedelta("5s") - datetime.timedelta(seconds=5) + >>> parse_timedelta("5s") == datetime.timedelta(seconds=5) + True - >>> parse_timedelta("-5s") - datetime.timedelta(days=-1, seconds=86395) + >>> parse_timedelta("-5s") == datetime.timedelta(days=-1, seconds=86395) + True :param delta: The string to process, e.g. '2h', '10d', '30s'. :return: The `datetime.timedelta` object or `None` in case of -- 2.39.5