]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: less noisy pytest failue messages
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 31 Jan 2020 10:31:14 +0000 (11:31 +0100)
committerSage Weil <sage@redhat.com>
Fri, 31 Jan 2020 13:16:11 +0000 (07:16 -0600)
Let's hide the `import pydevd` exception, as it doesn't provide any useful info

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/cephadm/tests/fixtures.py

index ac508256cf23babf2d0b3c4c19d26df67835303e..5b288d89566cbfa2f266241029e085849554bc10 100644 (file)
@@ -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])