Aggregate streaming tests and test stocks + options together

tests/test_questrade.py

@@ -178,23 +178,11 @@ async def test_option_quote_latency(tmx_symbols):
                 await trio.sleep(0.1)
 
 
-@tractor_test
+async def stream_option_chain(portal, symbols):
-async def test_option_streaming(tmx_symbols, loglevel):
+    """Start up an option quote stream.
-    """Set up option streaming using the broker daemon.
-    """
-    async with tractor.find_actor('brokerd') as portal:
-        async with tractor.open_nursery() as nursery:
-            # only one per host address, spawns an actor if None
-            if not portal:
-                # no brokerd actor found
-                portal = await nursery.start_actor(
-                    'data_feed',
-                    rpc_module_paths=[
-                        'piker.brokers.data',
-                        'piker.brokers.core'
-                    ],
-                )
 
+    ``symbols`` arg is ignored here.
+    """
     symbol = 'APHA.TO'  # your fave greenhouse LP
     async with qt.get_client() as client:
         contracts = await client.get_all_contracts([symbol])
@@ -240,7 +228,65 @@ async def test_option_streaming(tmx_symbols, loglevel):
             'modify_quote_stream',
             broker='questrade',
             feed_type='option',
-                    tickers=[],
+            symbols=[],
         )
+
+
+async def stream_stocks(portal, symbols):
+    """Start up a stock quote stream.
+    """
+    agen = await portal.run(
+        'piker.brokers.data',
+        'start_quote_stream',
+        broker='questrade',
+        symbols=symbols,
+    )
+    try:
+        # it'd sure be nice to have an asyncitertools here...
+        async for quotes in agen:
+            assert quotes
+            for key in quotes:
+                assert key in symbols
+            break
+    finally:
+        # unsub
+        await portal.run(
+            'piker.brokers.data',
+            'modify_quote_stream',
+            broker='questrade',
+            feed_type='stock',
+            symbols=[],
+        )
+
+
+@pytest.mark.parametrize(
+    'stream_what',
+    [
+        (stream_stocks,),
+        (stream_option_chain,),
+        (stream_stocks, stream_option_chain),
+    ],
+    ids=['stocks', 'options', 'stocks_and_options'],
+)
+@tractor_test
+async def test_quote_streaming(tmx_symbols, loglevel, stream_what):
+    """Set up option streaming using the broker daemon.
+    """
+    async with tractor.find_actor('brokerd') as portal:
+        async with tractor.open_nursery() as nursery:
+            # only one per host address, spawns an actor if None
+            if not portal:
+                # no brokerd actor found
+                portal = await nursery.start_actor(
+                    'data_feed',
+                    rpc_module_paths=[
+                        'piker.brokers.data',
+                        'piker.brokers.core'
+                    ],
+                )
+                async with trio.open_nursery() as n:
+                    for func in stream_what:
+                        n.start_soon(func, portal, tmx_symbols)
+
             # stop all spawned subactors
             await nursery.cancel()

tests/test_tractor.py

@@ -1,56 +0,0 @@
-"""
-Actor model API testing
-"""
-import pytest
-import tractor
-
-
-async def rx_price_quotes_from_brokerd(us_symbols):
-    """Verify we can spawn a daemon actor and retrieve streamed price data.
-    """
-    async with tractor.find_actor('brokerd') as portals:
-        if not portals:
-            # only one per host address, spawns an actor if None
-            async with tractor.open_nursery() as nursery:
-                # no brokerd actor found
-                portal = await nursery.start_actor(
-                    'brokerd',
-                    rpc_module_paths=['piker.brokers.data'],
-                )
-
-                # gotta expose in a broker agnostic way...
-                # retrieve initial symbol data
-                # sd = await portal.run(
-                #     'piker.brokers.data', 'symbol_data', symbols=us_symbols)
-                # assert list(sd.keys()) == us_symbols
-
-                gen = await portal.run(
-                    'piker.brokers.data',
-                    'start_quote_stream',
-                    broker='robinhood',
-                    tickers=us_symbols,
-                )
-                # it'd sure be nice to have an asyncitertools here...
-                async for quotes in gen:
-                    assert quotes
-                    for key in quotes:
-                        assert key in us_symbols
-                    break
-                    # terminate far-end async-gen
-                    # await gen.asend(None)
-                    # break
-
-                # stop all spawned subactors
-                await nursery.cancel()
-
-    # arbitter is cancelled here due to `find_actors()` internals
-    # (which internally uses `get_arbiter` which kills its channel
-    # server scope on exit)
-
-
-def test_rx_price_quotes_from_brokerd(us_symbols):
-    tractor.run(
-        rx_price_quotes_from_brokerd,
-        us_symbols,
-        name='arbiter',
-    )