removed extra CancelledError handling

daniel-sanche · daniel-sanche · commit de7b51a6e30a · 2023-06-16T17:22:40.000-07:00
diff --git a/google/api_core/retry_streaming_async.py b/google/api_core/retry_streaming_async.py
@@ -170,10 +170,11 @@ async def _iteration_helper(self, iteration_routine: Awaitable) -> T:
         self._check_timeout(datetime_helpers.utcnow())
         try:
             # grab the next value from the active_target
-            # Note: interrupting with asyncio.wait_for is expensive,
-            # so we only check  for timeouts at the start of each iteration
+            # Note: here would be a good place to add a timeout, like asyncio.wait_for.
+            # But wait_for is expensive, so we only check for timeouts at the
+            # start of each iteration.
             return await iteration_routine
-        except (Exception, asyncio.CancelledError) as exc:
+        except Exception as exc:
             await self._handle_exception(exc)
         # if retryable exception was handled, find the next value to return
         return await self.__anext__()
diff --git a/tests/asyncio/test_retry_async.py b/tests/asyncio/test_retry_async.py
@@ -541,9 +541,9 @@ def increase_time(sleep_delay):
         assert total_wait == 7
 
     @pytest.mark.asyncio
-    async def test___call___generator_await_cancel_retryable(self):
+    async def test___call___generator_cancellations(self):
         """
-        cancel calls should be supported as retryable errors
+        cancel calls should propagate to the generator
         """
         # test without cancel as retryable
         retry_ = retry_async.AsyncRetry(is_stream=True)
@@ -558,20 +558,6 @@ async def test___call___generator_await_cancel_retryable(self):
             await task
         with pytest.raises(StopAsyncIteration):
             await generator.__anext__()
-        # test with cancel as retryable
-        retry_cancel_ = retry_async.AsyncRetry(
-            predicate=retry_async.if_exception_type(asyncio.CancelledError),
-            is_stream=True,
-        )
-        generator = retry_cancel_(self._generator_mock)(sleep_time=0.2)
-        await generator.__anext__() == 0
-        await generator.__anext__() == 1
-        task = asyncio.create_task(generator.__anext__())
-        await asyncio.sleep(0.05)
-        task.cancel()
-        await task
-        assert task.result() == 0
-        await generator.__anext__() == 1
 
     @mock.patch("asyncio.sleep", autospec=True)
     @pytest.mark.asyncio
