Merge pull request jamesls#308 from jamesls/no-async-generator

bmerry · web-flow · commit 9725bd2eaef8 · 2021-09-08T17:18:34.000+02:00
Remove use of async_generator from tests
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -63,9 +63,9 @@ jobs:
       - run: pip install .
         if: ${{ matrix.coverage != 'yes' }}
       - run: flake8
-      - run: pytest --cov=fakeredis --cov-branch
+      - run: pytest -v --cov=fakeredis --cov-branch
         if: ${{ matrix.coverage == 'yes' }}
-      - run: pytest
+      - run: pytest -v
         if: ${{ matrix.coverage != 'yes' }}
       - run: coveralls --service=github
         env:
diff --git a/requirements.in b/requirements.in
@@ -1,5 +1,4 @@
 aioredis
-async_generator
 coverage
 flake8
 hypothesis
diff --git a/requirements.txt b/requirements.txt
@@ -1,13 +1,11 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    pip-compile requirements.in
 #
 aioredis==1.3.1
     # via -r requirements.in
-async-generator==1.10
-    # via -r requirements.in
 async-timeout==3.0.1
     # via aioredis
 attrs==20.3.0
@@ -42,18 +40,18 @@ pyflakes==2.2.0
     # via flake8
 pyparsing==2.4.7
     # via packaging
-pytest-asyncio==0.14.0
-    # via -r requirements.in
-pytest-cov==2.10.1
-    # via -r requirements.in
-pytest-mock==3.3.1
-    # via -r requirements.in
 pytest==6.1.2
     # via
     #   -r requirements.in
     #   pytest-asyncio
     #   pytest-cov
     #   pytest-mock
+pytest-asyncio==0.15.1
+    # via -r requirements.in
+pytest-cov==2.10.1
+    # via -r requirements.in
+pytest-mock==3.3.1
+    # via -r requirements.in
 redis==3.5.3
     # via -r requirements.in
 six==1.15.0
diff --git a/test/test_aioredis1.py b/test/test_aioredis1.py
@@ -3,7 +3,6 @@
 from packaging.version import Version
 import pytest
 import aioredis
-from async_generator import yield_, async_generator
 
 import fakeredis.aioredis
 
@@ -21,7 +20,6 @@
         pytest.param('real', marks=pytest.mark.real)
     ]
 )
-@async_generator
 async def r(request):
     if request.param == 'fake':
         ret = await fakeredis.aioredis.create_redis_pool()
@@ -31,19 +29,18 @@ async def r(request):
         ret = await aioredis.create_redis_pool('redis://localhost')
     await ret.flushall()
 
-    await yield_(ret)
+    yield ret
 
     await ret.flushall()
     ret.close()
     await ret.wait_closed()
 
 
 @pytest.fixture
-@async_generator
 async def conn(r):
     """A single connection, rather than a pool."""
     with await r as conn:
-        await yield_(conn)
+        yield conn
 
 
 async def test_ping(r):
diff --git a/test/test_aioredis2.py b/test/test_aioredis2.py
@@ -5,7 +5,6 @@
 import pytest
 import aioredis
 import async_timeout
-from async_generator import yield_, async_generator
 
 import fakeredis.aioredis
 
@@ -28,7 +27,6 @@
         pytest.param('real', marks=pytest.mark.real)
     ]
 )
-@async_generator
 async def r(request):
     if request.param == 'fake':
         fake_server = request.getfixturevalue('fake_server')
@@ -41,19 +39,18 @@ async def r(request):
     if not fake_server or fake_server.connected:
         await ret.flushall()
 
-    await yield_(ret)
+    yield ret
 
     if not fake_server or fake_server.connected:
         await ret.flushall()
     await ret.connection_pool.disconnect()
 
 
 @pytest.fixture
-@async_generator
 async def conn(r):
     """A single connection, rather than a pool."""
     async with r.client() as conn:
-        await yield_(conn)
+        yield conn
 
 
 async def test_ping(r):

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`aioredis`
`2`		`-async_generator`
`3`	`2`	`coverage`
`4`	`3`	`flake8`
`5`	`4`	`hypothesis`