fix switch_context (dont wait for an exception) (#2)

.gitignore

@@ -140,4 +140,5 @@ dmypy.json
 cython_debug/
 
 # IntelliJ
-.idea/
+.idea/
+.vscode/settings.json

tests/conftest.py

@@ -14,7 +14,7 @@
 @pytest.fixture(params=[
     pytest.param('asyncio'),
     pytest.param('trio'),
-    pytest.param('curio'),
+    # pytest.param('curio'),
 ])
 def anyio_backend(request):
     return request.param

tests/test_transitions_anyio.py

@@ -87,7 +87,6 @@ async def test_async_conditions(m):
     mock.assert_called_once_with()
 
 
-@pytest.mark.xfail(reason="we should investigate")
 async def test_multiple_models(machine_cls):
     m1 = machine_cls(states=['A', 'B', 'C'], initial='A', name="m1")
     m2 = machine_cls(states=['A'], initial='A', name='m2')
@@ -173,7 +172,7 @@ async def test_async_dispatch(machine_cls):
     assert machine.initial == model3.state
 
 
-@pytest.mark.xfail(reason="we should investigate")
+# @pytest.mark.xfail(reason="we should investigate")
 async def test_queued(machine_cls):
     states = ['A', 'B', 'C', 'D']
 

transitions_anyio/__init__.py

@@ -22,21 +22,20 @@ async def with_result(func):
 
     async def process_context(self, func, model):
         if self.current_context.get() is None:
-            try:
-                async with open_cancel_scope() as scope:
-                    self.current_context.set(scope)
-                    return await func()
-            except get_cancelled_exc_class():
-                return False
-        return await func()
-
-    def switch_model_context(self, model):
+            res = False
+            async with open_cancel_scope() as scope:
+                self.current_context.set(scope)
+                res = await self._process(func)
+            return res
+        return await self._process(func)
+
+    async def switch_model_context(self, model):
         current_scope = self.current_context.get()
         running_scope = self.async_tasks.get(model, None)
         if current_scope != running_scope:
-            if running_scope is not None:
-                self.async_tasks[model].cancel()
             self.async_tasks[model] = self.current_context.get()
+            if running_scope is not None:
+                await running_scope.cancel()
 
 
 class AnyIOGraphMachine(GraphMachine, AnyIOMachine):