From e47aa2b82885efc33fe1f5d13477cd1491fe4c0f Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 31 Jan 2020 11:31:14 +0100 Subject: [PATCH] mgr/cephadm: less noisy pytest failue messages Let's hide the `import pydevd` exception, as it doesn't provide any useful info Signed-off-by: Sebastian Wagner --- src/pybind/mgr/cephadm/tests/fixtures.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/tests/fixtures.py b/src/pybind/mgr/cephadm/tests/fixtures.py index ac508256cf2..5b288d89566 100644 --- a/src/pybind/mgr/cephadm/tests/fixtures.py +++ b/src/pybind/mgr/cephadm/tests/fixtures.py @@ -58,12 +58,17 @@ def wait(m, c): try: import pydevd # if in debugger + in_debug = True + except ImportError: + in_debug = False + + if in_debug: while True: # don't timeout if c.is_finished: raise_if_exception(c) return c.result time.sleep(0.1) - except ImportError: # not in debugger + else: for i in range(30): if i % 10 == 0: m.process([c]) -- 2.39.5