Merge branch 'master' into visi-email-plus

Author: invisig0th

synapse/tests/test_lib_cell.py

@@ -3492,7 +3492,7 @@ async def test_lib_cell_sadaha(self):
         async with self.getTestCell() as cell:
 
             self.none(await cell.getAhaProxy())
-            cell.ahaclient = await s_telepath.Client.anit('cell:///tmp/newp')
+            cell.ahaclient = await cell.enter_context(await s_telepath.Client.anit('cell:///tmp/newp'))
 
             # coverage for failure of aha client to connect
             with self.raises(TimeoutError):