Merge pull request #36 from touilleMan/pr-35-async_generator

Pr 35 async generator

Author: touilleMan

.travis.yml

@@ -13,9 +13,11 @@ matrix:
   - os: linux
     language: generic
     env: USE_PYPY_RELEASE_VERSION=5.9-beta
-  - os: osx
-    language: generic
-    env: MACPYTHON=3.5.4
+  # Python3.5 on MacOS doesn't currently support TLSv1.2 needed to use pip :(
+  # http://pyfound.blogspot.fr/2017/01/time-to-upgrade-your-python-tls-v12.html
+  # - os: osx
+  #   language: generic
+  #   env: MACPYTHON=3.5.4
   - os: osx
     language: generic
     env: MACPYTHON=3.6.3

pytest_trio/_tests/test_async_yield_fixture.py

@@ -1,23 +1,43 @@
 import sys
 import pytest
+import re
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
-def test_single_async_yield_fixture(testdir):
+@pytest.fixture(params=['Python>=36', 'async_generator'])
+def async_yield_implementation(request):
+    if request.param == 'Python>=36':
+        if sys.version_info < (3, 6):
+            pytest.skip("requires python3.6")
+        else:
 
+            def patch_code(code):
+                # Convert code to use Python>=3.6 builtin async generator
+                code = re.sub(r'(?m)^\s*@async_generator\n', r'', code)
+                code = re.sub(r'await yield_', r'yield', code)
+                return code
+
+            return patch_code
+    else:
+        return lambda x: x
+
+
+def test_single_async_yield_fixture(testdir, async_yield_implementation):
     testdir.makepyfile(
-        """
+        async_yield_implementation(
+            """
         import pytest
         import trio
+        from async_generator import async_generator, yield_
 
         events = []
 
         @pytest.fixture
+        @async_generator
         async def fix1():
             events.append('fix1 setup')
             await trio.sleep(0)
 
-            yield 'fix1'
+            await yield_('fix1')
 
             await trio.sleep(0)
             events.append('fix1 teardown')
@@ -36,39 +56,43 @@ def test_after():
                 'fix1 teardown',
             ]
     """
+        )
     )
 
     result = testdir.runpytest()
 
     result.assert_outcomes(passed=3)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
-def test_nested_async_yield_fixture(testdir):
+def test_nested_async_yield_fixture(testdir, async_yield_implementation):
 
     testdir.makepyfile(
-        """
+        async_yield_implementation(
+            """
         import pytest
         import trio
+        from async_generator import async_generator, yield_
 
         events = []
 
         @pytest.fixture
+        @async_generator
         async def fix2():
             events.append('fix2 setup')
             await trio.sleep(0)
 
-            yield 'fix2'
+            await yield_('fix2')
 
             await trio.sleep(0)
             events.append('fix2 teardown')
 
         @pytest.fixture
+        @async_generator
         async def fix1(fix2):
             events.append('fix1 setup')
             await trio.sleep(0)
 
-            yield 'fix1'
+            await yield_('fix1')
 
             await trio.sleep(0)
             events.append('fix1 teardown')
@@ -92,29 +116,34 @@ def test_after():
                 'fix2 teardown',
             ]
     """
+        )
     )
 
     result = testdir.runpytest()
 
     result.assert_outcomes(passed=3)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
-def test_async_yield_fixture_within_sync_fixture(testdir):
+def test_async_yield_fixture_within_sync_fixture(
+        testdir, async_yield_implementation
+):
 
     testdir.makepyfile(
-        """
+        async_yield_implementation(
+            """
         import pytest
         import trio
+        from async_generator import async_generator, yield_
 
         events = []
 
         @pytest.fixture
+        @async_generator
         async def fix2():
             events.append('fix2 setup')
             await trio.sleep(0)
 
-            yield 'fix2'
+            await yield_('fix2')
 
             await trio.sleep(0)
             events.append('fix2 teardown')
@@ -139,29 +168,34 @@ def test_after():
                 'fix2 teardown',
             ]
     """
+        )
     )
 
     result = testdir.runpytest()
 
     result.assert_outcomes(passed=3)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
-def test_async_yield_fixture_within_sync_yield_fixture(testdir):
+def test_async_yield_fixture_within_sync_yield_fixture(
+        testdir, async_yield_implementation
+):
 
     testdir.makepyfile(
-        """
+        async_yield_implementation(
+            """
         import pytest
         import trio
+        from async_generator import async_generator, yield_
 
         events = []
 
         @pytest.fixture
+        @async_generator
         async def fix2():
             events.append('fix2 setup')
             await trio.sleep(0)
 
-            yield 'fix2'
+            await yield_('fix2')
 
             await trio.sleep(0)
             events.append('fix2 teardown')
@@ -191,32 +225,38 @@ def test_after():
                 'fix2 teardown',
             ]
     """
+        )
     )
 
     result = testdir.runpytest()
 
     result.assert_outcomes(passed=3)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
-def test_async_yield_fixture_with_multiple_yields(testdir):
+def test_async_yield_fixture_with_multiple_yields(
+        testdir, async_yield_implementation
+):
 
     testdir.makepyfile(
-        """
+        async_yield_implementation(
+            """
         import pytest
         import trio
+        from async_generator import async_generator, yield_
 
         @pytest.fixture
+        @async_generator
         async def fix1():
             await trio.sleep(0)
-            yield 'good'
+            await yield_('good')
             await trio.sleep(0)
-            yield 'bad'
+            await yield_('bad')
 
         @pytest.mark.trio
         async def test_actual_test(fix1):
             pass
     """
+        )
     )
 
     result = testdir.runpytest()
@@ -226,13 +266,14 @@ async def test_actual_test(fix1):
     result.assert_outcomes(failed=1)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
-def test_async_yield_fixture_with_nursery(testdir):
+def test_async_yield_fixture_with_nursery(testdir, async_yield_implementation):
 
     testdir.makepyfile(
-        """
+        async_yield_implementation(
+            """
         import pytest
         import trio
+        from async_generator import async_generator, yield_
 
 
         async def handle_client(stream):
@@ -242,10 +283,11 @@ async def handle_client(stream):
 
 
         @pytest.fixture
+        @async_generator
         async def server():
             async with trio.open_nursery() as nursery:
                 listeners = await nursery.start(trio.serve_tcp, handle_client, 0)
-                yield listeners[0]
+                await yield_(listeners[0])
                 nursery.cancel_scope.cancel()
 
 
@@ -256,35 +298,41 @@ async def test_actual_test(server):
             rep = await stream.receive_some(4)
             assert rep == b'ping'
     """
+        )
     )
 
     result = testdir.runpytest()
 
     result.assert_outcomes(passed=1)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
-def test_async_yield_fixture_crashed_teardown_allow_other_teardowns(testdir):
+def test_async_yield_fixture_crashed_teardown_allow_other_teardowns(
+        testdir, async_yield_implementation
+):
 
     testdir.makepyfile(
-        """
+        async_yield_implementation(
+            """
         import pytest
         import trio
+        from async_generator import async_generator, yield_
 
         events = []
 
         @pytest.fixture
+        @async_generator
         async def good_fixture():
             async with trio.open_nursery() as nursery:
                 events.append('good_fixture setup')
-                yield
+                await yield_(None)
                 events.append('good_fixture teardown')
 
         @pytest.fixture
+        @async_generator
         async def bad_fixture():
             async with trio.open_nursery() as nursery:
                 events.append('bad_fixture setup')
-                yield
+                await yield_(None)
                 events.append('bad_fixture teardown')
                 raise RuntimeError('Crash during fixture teardown')
 
@@ -303,6 +351,7 @@ def test_after():
                 'good_fixture teardown',
             ]
     """
+        )
     )
 
     result = testdir.runpytest()