From a670b9f6609ec01aa5f97c8005e0575f18334ac5 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 21 May 2015 16:41:27 +0800
Subject: [PATCH] tools/asyncio_wait_or_cancel: wait for cancellation

---
 artiq/tools.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/artiq/tools.py b/artiq/tools.py
index 78bf3b819..2b5400a93 100644
--- a/artiq/tools.py
+++ b/artiq/tools.py
@@ -109,6 +109,7 @@ def asyncio_wait_or_cancel(fs, **kwargs):
         raise
     for f in p:
         f.cancel()
+        yield from asyncio.wait([f])
     return fs