Merge 26c3980 into 5e3a173

vxgmichel · Feb 22, 2020 · 95015f3 · 95015f3
2 parents 5e3a173 + 26c3980
commit 95015f3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/aiostream/aiter_utils.py b/aiostream/aiter_utils.py
@@ -153,8 +153,13 @@ async def __aexit__(self, typ, value, traceback):
                 if not getattr(self._aiterator, "ag_frame", True):
                     return False
 
+                # Cannot throw at the moment
+                if getattr(self._aiterator, 'ag_running', False):
+                    return False
+
                 # Throw
                 try:
+                    print(typ, value, traceback)
                     await self._aiterator.athrow(typ, value, traceback)
                     raise RuntimeError(
                         "Async iterator didn't stop after athrow()")

diff --git a/aiostream/manager.py b/aiostream/manager.py
@@ -36,6 +36,8 @@ async def cancel_task(self, task):
             await task
         except asyncio.CancelledError:
             pass
+        except StopAsyncIteration:
+            pass
 
 
 class StreamerManager:

diff --git a/tests/test_combine.py b/tests/test_combine.py
@@ -126,6 +126,12 @@ async def test_merge(assert_run, event_loop):
         await assert_run(ys[:3], [0, 1, 2])
         assert event_loop.steps == [1, 1]
 
+    with event_loop.assert_cleanup():
+        xs = stream.just(1) + stream.never()
+        ys = xs | pipe.merge(xs) | pipe.timeout(1)
+        await assert_run(ys, [1, 1], asyncio.TimeoutError())
+        assert event_loop.steps == [1]
+
 
 @pytest.mark.asyncio
 async def test_ziplatest(assert_run, event_loop):