raise errors when assembling output

and increase timeout for tk

Author: minrk

tests/test_matplotlib_eventloops.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import time
 
@@ -37,6 +38,9 @@ def execute(
 def test_matplotlib_gui(kc, gui):
     """Make sure matplotlib activates and its eventloop runs while the kernel is also responsive"""
     pytest.importorskip("matplotlib", reason="this test requires matplotlib")
+    if gui in {"tk", "qt"} and os.getenv("GITHUB_ACTIONS") and sys.platform == "linux":
+        pytest.skip("tk, qt tests not working yet on Linux CI")
+
     stdout, stderr = execute(kc, f"%matplotlib {gui}")
     assert not stderr
     # debug: show output from invoking the matplotlib magic
@@ -69,15 +73,21 @@ def add_call():
 timer.start()
 """,
     )
-    # wait for the first call (up to 10 seconds)
-    for _ in range(100):
+    # wait for the first call (up to 30 seconds)
+    deadline = time.monotonic() + 30
+    done = False
+    while time.monotonic() <= deadline:
         stdout, _ = execute(kc, "print(f.done())")
         if stdout.strip() == "True":
+            done = True
             break
         if stdout == "False":
             time.sleep(0.1)
         else:
             pytest.fail(f"Unexpected output {stdout}")
+    if not done:
+        pytest.fail("future never finished...")
+
     time.sleep(0.25)
     stdout, _ = execute(kc, "print(call_count)")
     call_count = int(stdout)

tests/utils.py

@@ -168,7 +168,7 @@ def new_kernel(argv=None):
     return manager.run_kernel(**kwargs)
 
 
-def assemble_output(get_msg, timeout=1, parent_msg_id: str | None = None):
+def assemble_output(get_msg, timeout=1, parent_msg_id: str | None = None, raise_error=True):
     """assemble stdout/err from an execution"""
     stdout = ""
     stderr = ""
@@ -191,6 +191,12 @@ def assemble_output(get_msg, timeout=1, parent_msg_id: str | None = None):
                 stderr += content["text"]
             else:
                 raise KeyError("bad stream: %r" % content["name"])
+        elif raise_error and msg["msg_type"] == "error":
+            tb = "\n".join(msg["content"]["traceback"])
+            msg = f"Execution failed with:\n{tb}"
+            if stderr:
+                msg = f"{msg}\nstderr:\n{stderr}"
+            raise RuntimeError(msg)
         else:
             # other output, ignored
             pass