Use pytest-asyncio in auto mode

Remove overly genereric `pytestmark=pytest.mark.asyncio` causing lots of warning noise
redis · Jun 28, 2022 · ebcd7d1 · ebcd7d1
1 parent e6cd4fd
commit ebcd7d1
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 30 deletions.
diff --git a/tests/test_asyncio/test_bloom.py b/tests/test_asyncio/test_bloom.py
@@ -4,8 +4,6 @@
 from redis.exceptions import ModuleError, RedisError
 from redis.utils import HIREDIS_AVAILABLE
 
-pytestmark = pytest.mark.asyncio
-
 
 def intlist(obj):
     return [int(v) for v in obj]

diff --git a/tests/test_asyncio/test_cluster.py b/tests/test_asyncio/test_cluster.py
@@ -39,8 +39,6 @@
     skip_unless_arch_bits,
 )
 
-pytestmark = pytest.mark.asyncio
-
 default_host = "127.0.0.1"
 default_port = 7000
 default_cluster_slots = [

diff --git a/tests/test_asyncio/test_commands.py b/tests/test_asyncio/test_commands.py
@@ -27,9 +27,6 @@
 REDIS_6_VERSION = "5.9.0"
 
 
-pytestmark = pytest.mark.asyncio
-
-
 @pytest_asyncio.fixture()
 async def slowlog(r: redis.Redis, event_loop):
     current_config = await r.config_get()

diff --git a/tests/test_asyncio/test_connection.py b/tests/test_asyncio/test_connection.py
@@ -10,8 +10,6 @@
 
 from .compat import mock
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest.mark.onlynoncluster
 @pytest.mark.skipif(HIREDIS_AVAILABLE, reason="PythonParser only")

diff --git a/tests/test_asyncio/test_connection_pool.py b/tests/test_asyncio/test_connection_pool.py
@@ -17,8 +17,6 @@
 from .compat import mock
 from .test_pubsub import wait_for_message
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest.mark.onlynoncluster
 class TestRedisAutoReleaseConnectionPool:

diff --git a/tests/test_asyncio/test_encoding.py b/tests/test_asyncio/test_encoding.py
@@ -10,8 +10,6 @@
 import redis.asyncio as redis
 from redis.exceptions import DataError
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest.mark.onlynoncluster
 class TestEncoding:

diff --git a/tests/test_asyncio/test_json.py b/tests/test_asyncio/test_json.py
@@ -5,8 +5,6 @@
 from redis.commands.json.path import Path
 from tests.conftest import skip_ifmodversion_lt
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest.mark.redismod
 async def test_json_setbinarykey(modclient: redis.Redis):

diff --git a/tests/test_asyncio/test_lock.py b/tests/test_asyncio/test_lock.py
@@ -11,8 +11,6 @@
 from redis.asyncio.lock import Lock
 from redis.exceptions import LockError, LockNotOwnedError
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest.mark.onlynoncluster
 class TestLock:

diff --git a/tests/test_asyncio/test_monitor.py b/tests/test_asyncio/test_monitor.py
@@ -4,8 +4,6 @@
 
 from .conftest import wait_for_command
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest.mark.onlynoncluster
 class TestMonitor:

diff --git a/tests/test_asyncio/test_pipeline.py b/tests/test_asyncio/test_pipeline.py
@@ -5,8 +5,6 @@
 
 from .conftest import wait_for_command
 
-pytestmark = pytest.mark.asyncio
-
 
 class TestPipeline:
     @pytest.mark.onlynoncluster

diff --git a/tests/test_asyncio/test_pubsub.py b/tests/test_asyncio/test_pubsub.py
@@ -18,8 +18,6 @@
 
 from .compat import mock
 
-pytestmark = pytest.mark.asyncio(forbid_global_loop=True)
-
 
 def with_timeout(t):
     def wrapper(corofunc):

diff --git a/tests/test_asyncio/test_search.py b/tests/test_asyncio/test_search.py
@@ -18,9 +18,6 @@
 from redis.commands.search.suggestion import Suggestion
 from tests.conftest import skip_ifmodversion_lt
 
-pytestmark = pytest.mark.asyncio
-
-
 WILL_PLAY_TEXT = os.path.abspath(
     os.path.join(os.path.dirname(__file__), "testdata", "will_play_text.csv.bz2")
 )

diff --git a/tests/test_asyncio/test_sentinel.py b/tests/test_asyncio/test_sentinel.py
@@ -17,8 +17,6 @@
     SlaveNotFoundError,
 )
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest_asyncio.fixture(scope="module")
 def master_ip(master_host):

diff --git a/tests/test_asyncio/test_timeseries.py b/tests/test_asyncio/test_timeseries.py
@@ -6,8 +6,6 @@
 import redis.asyncio as redis
 from tests.conftest import skip_ifmodversion_lt
 
-pytestmark = pytest.mark.asyncio
-
 
 @pytest.mark.redismod
 async def test_create(modclient: redis.Redis):

diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ markers =
     asyncio: marker for async tests
     replica: replica tests
     experimental: run only experimental tests
+asyncio_mode = auto
 
 [tox]
 minversion = 3.2.0