From: Brad Hubbard <bhubbard@redhat.com>
Date: Fri, 24 Sep 2021 02:22:42 +0000 (+1000)
Subject: mgr/dashboard: More robust handling of timedelta() representation
X-Git-Tag: v16.2.7~67^2~55
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9f70f884dd5c59b0f37300084a898d000013b659;p=ceph.git

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 <bhubbard@redhat.com>
(cherry picked from commit ad1a4f2410393cab6ac728c4ddb79d111e252559)
---

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