From 4f67ac0337596170fcf36b0a8c88e9c023eba3b8 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Fri, 26 May 2023 17:16:43 -0400
Subject: [PATCH] Change to new context-cancelled msg contents: pikerd is
 canceller

---
 tests/conftest.py      |  3 +++
 tests/test_services.py | 24 ++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 3dce2014..366d5d95 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -103,6 +103,9 @@ async def _open_test_pikerd(
     a different port then the default to allow testing alongside
     a running stack.
 
+    Calls `.service._actor_runtime.maybe_open_pikerd()``
+    to boot the root actor / tractor runtime.
+
     '''
     import random
     from piker.service import maybe_open_pikerd
diff --git a/tests/test_services.py b/tests/test_services.py
index 082f629f..6f7b6f4c 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -33,8 +33,8 @@ def test_runtime_boot(
 ):
     '''
     Verify we can boot the `pikerd` service stack using the
-    `open_test_pikerd` fixture helper and that registry address details
-    match up.
+    `open_test_pikerd()` fixture helper and that contact-registry
+    address details match up.
 
     '''
     async def main():
@@ -55,6 +55,9 @@ def test_runtime_boot(
             assert pikerd_portal.channel.raddr == daemon_addr
             assert pikerd_portal.channel.raddr == portal.channel.raddr
 
+            # no service tasks should be started
+            assert not services.service_tasks
+
     trio.run(main)
 
 
@@ -121,8 +124,7 @@ def test_ensure_ems_in_paper_actors(
     async def main():
 
         # type declares
-        book: OrderClient
-        trades_stream: tractor.MsgStream
+        client: OrderClient
         pps: dict[str, list[BrokerdPosition]]
         accounts: list[str]
         dialogs: dict[str, Status]
@@ -139,8 +141,8 @@ def test_ensure_ems_in_paper_actors(
                     mode='paper',
                     loglevel=loglevel,
                 ) as (
-                    book,
-                    trades_stream,
+                    client,
+                    _,  # trades_stream: tractor.MsgStream
                     pps,
                     accounts,
                     dialogs,
@@ -152,6 +154,9 @@ def test_ensure_ems_in_paper_actors(
                 assert not pps
                 assert not dialogs
 
+                assert not client._sent_orders
+                assert accounts
+
                 pikerd_subservices = ['emsd', 'samplerd']
 
                 async with (
@@ -169,10 +174,13 @@ def test_ensure_ems_in_paper_actors(
                     print('ALL SERVICES STARTED, terminating..')
                     await services.cancel_service('emsd')
 
+    # ensure we receive a remote cancellation error caused by the
+    # pikerd root actor since we used the `.cancel_service()` API
+    # above B)
     with pytest.raises(
         tractor._exceptions.ContextCancelled,
     ) as exc_info:
         trio.run(main)
 
-    cancel_msg: str = '_emsd_main()` was remotely cancelled by its caller'
-    assert cancel_msg in exc_info.value.args[0]
+    cancelled_msg: str = "was remotely cancelled by remote actor (\'pikerd\'"
+    assert cancelled_msg in exc_info.value.args[0]