.github/workflows/ci.yml

@@ -120,4 +120,4 @@ jobs:
         run: pip install -U . -r requirements-test.txt -r requirements-docs.txt --upgrade-strategy eager
 
       - name: Run tests
-        run: pytest tests/ --spawn-backend=${{ matrix.spawn_backend }} -rs --full-trace
+        run: pytest tests/ --spawn-backend=${{ matrix.spawn_backend }} -rs

tests/test_debugger.py

@@ -1,5 +1,5 @@
 """
-That "native" debug mode better work!
+That native debug better work!
 
 All these tests can be understood (somewhat) by running the equivalent
 `examples/debugging/` scripts manually.
@@ -13,7 +13,6 @@ TODO:
 import time
 from os import path
 import platform
-from typing import Optional
 
 import pytest
 import pexpect
@@ -74,14 +73,6 @@ def spawn(
     return _spawn
 
 
-@pytest.fixture(
-    params=[False, True],
-    ids='ctl-c={}'.format,
-)
-def ctlc(request) -> bool:
-    yield request.param
-
-
 @pytest.mark.parametrize(
     'user_in_out',
     [
@@ -146,50 +137,20 @@ def test_root_actor_bp(spawn, user_in_out):
         assert expect_err_str in str(child.before)
 
 
-def do_ctlc(
+def test_root_actor_bp_forever(spawn):
-    child,
-    count: int = 3,
-    patt: Optional[str] = None,
-
-) -> None:
-
-    # make sure ctl-c sends don't do anything but repeat output
-    for _ in range(count):
-        child.sendcontrol('c')
-        child.expect(r"\(Pdb\+\+\)")
-
-        if patt:
-            # should see the last line on console
-            before = str(child.before.decode())
-            assert patt in before
-
-
-def test_root_actor_bp_forever(
-    spawn,
-    ctlc: bool,
-):
     "Re-enter a breakpoint from the root actor-task."
     child = spawn('root_actor_breakpoint_forever')
 
     # do some "next" commands to demonstrate recurrent breakpoint
     # entries
     for _ in range(10):
-
+        child.sendline('next')
         child.expect(r"\(Pdb\+\+\)")
 
-        if ctlc:
+    # do one continue which should trigger a new task to lock the tty
-            do_ctlc(child)
-
-        child.sendline('next')
-
-    # do one continue which should trigger a
-    # new task to lock the tty
     child.sendline('continue')
     child.expect(r"\(Pdb\+\+\)")
 
-    if ctlc:
-        do_ctlc(child)
-
     # XXX: this previously caused a bug!
     child.sendline('n')
     child.expect(r"\(Pdb\+\+\)")
@@ -197,15 +158,8 @@ def test_root_actor_bp_forever(
     child.sendline('n')
     child.expect(r"\(Pdb\+\+\)")
 
-    # quit out of the loop
-    child.sendline('q')
-    child.expect(pexpect.EOF)
 
-
+def test_subactor_error(spawn):
-def test_subactor_error(
-    spawn,
-    ctlc: bool,
-):
     "Single subactor raising an error"
 
     child = spawn('subactor_error')
@@ -216,29 +170,23 @@ def test_subactor_error(
     before = str(child.before.decode())
     assert "Attaching to pdb in crashed actor: ('name_error'" in before
 
-    # make sure ctl-c sends don't do anything but repeat output
+    # send user command
-    if ctlc:
+    # (in this case it's the same for 'continue' vs. 'quit')
-        do_ctlc(
-            child,
-            patt='(doggypants)',
-        )
-
-    # send user command and (in this case it's the same for 'continue'
-    # vs. 'quit') the debugger should enter a second time in the nursery
-    # creating actor
     child.sendline('continue')
+
+    # the debugger should enter a second time in the nursery
+    # creating actor
+
     child.expect(r"\(Pdb\+\+\)")
 
     before = str(child.before.decode())
+
     # root actor gets debugger engaged
     assert "Attaching to pdb in crashed actor: ('root'" in before
+
     # error is a remote error propagated from the subactor
     assert "RemoteActorError: ('name_error'" in before
 
-    # another round
-    if ctlc:
-        do_ctlc(child)
-
     child.sendline('c')
     child.expect('\r\n')
 

tests/test_docs_examples.py

@@ -81,14 +81,11 @@ def run_example_in_subproc(loglevel, testdir, arb_addr):
     'example_script',
 
     # walk yields: (dirpath, dirnames, filenames)
-    [
+    [(p[0], f) for p in os.walk(examples_dir()) for f in p[2]
-        (p[0], f) for p in os.walk(examples_dir()) for f in p[2]
 
         if '__' not in f
         and f[0] != '_'
-        and 'debugging' not in p[0]
+        and 'debugging' not in p[0]],
-        and 'integration' not in p[0]
-    ],
 
     ids=lambda t: t[1],
 )

tractor/_actor.py

@@ -611,8 +611,7 @@ class Actor:
                     entry = local_nursery._children.get(uid)
                     if entry:
                         _, proc, _ = entry
-                        log.warning(
+                        log.warning(f'Actor {uid}@{proc} IPC connection broke!?')
-                            f'Actor {uid}@{proc} IPC connection broke!?')
                         # if proc.poll() is not None:
                         #     log.error('Actor {uid} proc died and IPC broke?')
 
@@ -631,11 +630,6 @@ class Actor:
                     # Attempt to wait for the far end to close the channel
                     # and bail after timeout (2-generals on closure).
                     assert chan.msgstream
-
-                    log.runtime(
-                        f'Draining lingering msgs from stream {chan.msgstream}'
-                    )
-
                     async for msg in chan.msgstream.drain():
                         # try to deliver any lingering msgs
                         # before we destroy the channel.

tractor/_debug.py

@@ -41,7 +41,6 @@ from .log import get_logger
 from ._discovery import get_root
 from ._state import is_root_process, debug_mode
 from ._exceptions import is_multi_cancelled
-from ._ipc import Channel
 
 
 try:
@@ -397,10 +396,6 @@ def mk_mpdb() -> tuple[MultiActorPdb, Callable]:
         signal.SIGINT,
         partial(shield_sigint, pdb_obj=pdb),
     )
-
-    # XXX: These are the important flags mentioned in
-    # https://github.com/python-trio/trio/issues/1155
-    # which resolve the traceback spews to console.
     pdb.allow_kbdint = True
     pdb.nosigint = True
 
@@ -469,15 +464,11 @@ async def _breakpoint(
         _local_task_in_debug = task_name
 
         def child_release_hook():
-            try:
+            # _local_task_in_debug = None
-                # sometimes the ``trio`` might already be termianated in
+            _local_pdb_complete.set()
-                # which case this call will raise.
+
-                _local_pdb_complete.set()
+            # restore original sigint handler
-            finally:
+            undo_sigint()
-                # restore original sigint handler
-                undo_sigint()
-                # should always be cleared in the hijack hook aboved right?
-                # _local_task_in_debug = None
 
         # assign unlock callback for debugger teardown hooks
         # _pdb_release_hook = _local_pdb_complete.set
@@ -548,14 +539,10 @@ async def _breakpoint(
 
             _global_actor_in_debug = None
             _local_task_in_debug = None
+            _local_pdb_complete.set()
 
-            try:
+            # restore original sigint handler
-                # sometimes the ``trio`` might already be termianated in
+            undo_sigint()
-                # which case this call will raise.
-                _local_pdb_complete.set()
-            finally:
-                # restore original sigint handler
-                undo_sigint()
 
         _pdb_release_hook = teardown
 
@@ -613,21 +600,7 @@ def shield_sigint(
 
     actor = tractor.current_actor()
 
-    def do_cancel():
-        # If we haven't tried to cancel the runtime then do that instead
-        # of raising a KBI (which may non-gracefully destroy
-        # a ``trio.run()``).
-        if not actor._cancel_called:
-            actor.cancel_soon()
-
-        # If the runtime is already cancelled it likely means the user
-        # hit ctrl-c again because teardown didn't full take place in
-        # which case we do the "hard" raising of a local KBI.
-        else:
-            raise KeyboardInterrupt
-
     any_connected = False
-
     if uid_in_debug is not None:
         # try to see if the supposed (sub)actor in debug still
         # has an active connection to *this* actor, and if not
@@ -643,7 +616,6 @@ def shield_sigint(
                     f'{uid_in_debug}\n'
                     'Allowing SIGINT propagation..'
                 )
-                return do_cancel()
 
     # root actor branch that reports whether or not a child
     # has locked debugger.
@@ -672,16 +644,6 @@ def shield_sigint(
     elif (
         not is_root_process()
     ):
-        chan: Channel = actor._parent_chan
-        if not chan or not chan.connected():
-            log.warning(
-                'A global actor reported to be in debug '
-                'but no connection exists for its parent:\n'
-                f'{uid_in_debug}\n'
-                'Allowing SIGINT propagation..'
-            )
-            return do_cancel()
-
         task = _local_task_in_debug
         if task:
             log.pdb(
@@ -697,6 +659,20 @@ def shield_sigint(
                 "Ignoring SIGINT since debug mode is enabled"
             )
 
+    # noone has the debugger so raise KBI
+    else:
+        # If we haven't tried to cancel the runtime then do that instead
+        # of raising a KBI (which may non-gracefully destroy
+        # a ``trio.run()``).
+        if not actor._cancel_called:
+            actor.cancel_soon()
+
+        # If the runtime is already cancelled it likely means the user
+        # hit ctrl-c again because teardown didn't full take place in
+        # which case we do the "hard" raising of a local KBI.
+        else:
+            raise KeyboardInterrupt
+
     # maybe redraw/print last REPL output to console
     if pdb_obj:
 
@@ -711,13 +687,8 @@ def shield_sigint(
         # https://github.com/prompt-toolkit/python-prompt-toolkit/blob/c2c6af8a0308f9e5d7c0e28cb8a02963fe0ce07a/prompt_toolkit/patch_stdout.py
 
         try:
-            # XXX: lol, see ``pdbpp`` issue:
+            pdb_obj.do_longlist(None)
-            # https://github.com/pdbpp/pdbpp/issues/496
+            print(pdb_obj.prompt, end='', flush=True)
-            # pdb_obj.do_longlist(None)
-            # pdb_obj.lastcmd = 'longlist'
-            pdb_obj._printlonglist(max_lines=False)
-            # print(pdb_obj.prompt, end='', flush=True)
-
         except AttributeError:
             log.exception('pdbpp longlist failed...')
             raise KeyboardInterrupt
@@ -738,7 +709,7 @@ def _set_trace(
     # start 2 levels up in user code
     frame: FrameType = sys._getframe()
     if frame:
-        frame = frame.f_back  # type: ignore
+        frame = frame.f_back.f_back  # type: ignore
 
     if pdb and actor is not None:
         log.pdb(f"\nAttaching pdb to actor: {actor.uid}\n")

tractor/_ipc.py

@@ -231,7 +231,7 @@ class MsgspecTCPStream(MsgpackTCPStream):
 
         '''
         import msgspec  # noqa
-        decodes_failed: int = 0
+        last_decode_failed: bool = False
 
         while True:
             try:
@@ -268,17 +268,12 @@ class MsgspecTCPStream(MsgpackTCPStream):
                 msgspec.DecodeError,
                 UnicodeDecodeError,
             ):
-                if decodes_failed < 4:
+                if not last_decode_failed:
                     # ignore decoding errors for now and assume they have to
                     # do with a channel drop - hope that receiving from the
                     # channel will raise an expected error and bubble up.
-                    decoded_bytes = msg_bytes.decode()
+                    log.error('`msgspec` failed to decode!?')
-                    log.error(
+                    last_decode_failed = True
-                        '`msgspec` failed to decode!?\n'
-                        'dumping bytes:\n'
-                        f'{decoded_bytes}'
-                    )
-                    decodes_failed += 1
                 else:
                     raise
 

tractor/_portal.py

@@ -511,8 +511,8 @@ class Portal:
             if ctx.chan.connected():
                 log.info(
                     'Waiting on final context-task result for\n'
-                    f'task: {cid}\n'
+                    f'task:{cid}\n'
-                    f'actor: {uid}'
+                    f'actor:{uid}'
                 )
                 result = await ctx.result()
 

tractor/to_asyncio.py

@@ -259,7 +259,6 @@ def _run_asyncio_task(
         nonlocal chan
         aio_err = chan._aio_err
         task_err: Optional[BaseException] = None
-        tname = task.get_name()
 
         # only to avoid ``asyncio`` complaining about uncaptured
         # task exceptions
@@ -269,10 +268,9 @@ def _run_asyncio_task(
             task_err = terr
 
             if isinstance(terr, CancelledError):
-                log.cancel(
+                log.cancel(f'`asyncio` task cancelled: {task.get_name()}')
-                    f'infected `asyncio` task cancelled: {tname}')
             else:
-                log.exception(f'`asyncio` task: {tname} errored')
+                log.exception(f'`asyncio` task: {task.get_name()} errored')
 
             assert type(terr) is type(aio_err), 'Asyncio task error mismatch?'
 
@@ -287,24 +285,21 @@ def _run_asyncio_task(
             # We might want to change this in the future though.
             from_aio.close()
 
-            # if type(aio_err) is CancelledError:
+            if type(aio_err) is CancelledError:
-            #     if not task_err:
+                log.cancel("infected task was cancelled")
-            #         log.cancel(
-            #             f"infected task {tname} cancelled itself, was not ``trio``"
-            #         )
 
                 # TODO: show that the cancellation originated
                 # from the ``trio`` side? right?
                 # if cancel_scope.cancelled:
                 #     raise aio_err from err
 
-            if task_err is None:
+            elif task_err is None:
                 assert aio_err
                 aio_err.with_traceback(aio_err.__traceback__)
-                # msg = ''.join(traceback.format_exception(type(aio_err)))
+                msg = ''.join(traceback.format_exception(type(aio_err)))
-                # log.error(
+                log.error(
-                #     f'infected task errorred:\n{msg}'
+                    f'infected task errorred:\n{msg}'
-                # )
+                )
 
             # raise any ``asyncio`` side error.
             raise aio_err
@@ -397,8 +392,8 @@ async def run_task(
 
 ) -> Any:
     '''
-    Run an ``asyncio`` async function or generator in a new task, block
+    Run an ``asyncio`` async function or generator in a task, return
-    and return the result back to ``trio``.
+    or stream the result back to ``trio``.
 
     '''
     # simple async func