From 2ebcc66bc54fe4b949fdd6e8a1c45f6701c466f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stephan=20M=C3=BCller?= Date: Fri, 14 Jun 2019 15:17:09 +0200 Subject: [PATCH] mgr: Adjust doctest format of merge_dicts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As tox didn't exits before to run unit tests presented as doctests, the included doctest hadn't failed before, because of it's wrong format. I adjusted the format so that the doctest passes. Fixes: https://tracker.ceph.com/issues/40363 Signed-off-by: Stephan Müller --- src/pybind/mgr/mgr_util.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py index 42e00da2aa08..35f629c967f3 100644 --- a/src/pybind/mgr/mgr_util.py +++ b/src/pybind/mgr/mgr_util.py @@ -82,9 +82,13 @@ def format_bytes(n, width, colored=True): def merge_dicts(*args): # type: (dict) -> dict """ - >>> assert merge_dicts({1:2}, {3:4}) == {1:2, 3:4} - You can also overwrite keys: - >>> assert merge_dicts({1:2}, {1:4}) == {1:4} + >>> merge_dicts({1:2}, {3:4}) + {1: 2, 3: 4} + + You can also overwrite keys: + >>> merge_dicts({1:2}, {1:4}) + {1: 4} + :rtype: dict[str, Any] """ ret = {} -- 2.47.3