cancel_and_wait: Re-raise if it was our task

Reraise the cancel error if it was our task that was cancelled.

Signed-off-by: Mathias L. Baumann <[email protected]>

Author: Marenz

src/frequenz/sdk/_internal/_asyncio.py

@@ -23,14 +23,18 @@ async def cancel_and_await(task: asyncio.Task[Any]) -> None:
 
     Args:
         task: The task to be cancelled and waited for.
+
+    Raises:
+        asyncio.CancelledError: when our task was cancelled
     """
     if task.done():
         return
     task.cancel()
     try:
         await task
     except asyncio.CancelledError:
-        pass
+        if not task.cancelled():
+            raise
 
 
 def is_loop_running() -> bool: