re-introduce pytestmark=pytest.mark.asyncio for python 3.6

Author: kristjanvalur

tests/test_asyncio/conftest.py

@@ -3,11 +3,6 @@
 from typing import Union
 from urllib.parse import urlparse
 
-if sys.version_info[0:2] == (3, 6):
-    import pytest as pytest_asyncio
-else:
-    import pytest_asyncio
-
 import pytest
 from packaging.version import Version
 
@@ -25,6 +20,13 @@
 
 from .compat import mock
 
+if sys.version_info[0:2] == (3, 6):
+    import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
+else:
+    import pytest_asyncio
+
 
 async def _get_info(redis_url):
     client = redis.Redis.from_url(redis_url)

tests/test_asyncio/test_bloom.py

@@ -1,9 +1,14 @@
+import sys
+
 import pytest
 
 import redis.asyncio as redis
 from redis.exceptions import ModuleError, RedisError
 from redis.utils import HIREDIS_AVAILABLE
 
+if sys.version_info[0:2] == (3, 6):
+    pytestmark = pytest.mark.asyncio
+
 
 def intlist(obj):
     return [int(v) for v in obj]

tests/test_asyncio/test_cluster.py

@@ -11,6 +11,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_commands.py

@@ -12,6 +12,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_connection.py

@@ -1,4 +1,5 @@
 import asyncio
+import sys
 import types
 
 import pytest
@@ -10,6 +11,9 @@
 
 from .compat import mock
 
+if sys.version_info[0:2] == (3, 6):
+    pytestmark = pytest.mark.asyncio
+
 
 @pytest.mark.onlynoncluster
 @pytest.mark.skipif(HIREDIS_AVAILABLE, reason="PythonParser only")

tests/test_asyncio/test_connection_pool.py

@@ -7,6 +7,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_encoding.py

@@ -4,6 +4,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_lock.py

@@ -5,6 +5,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_monitor.py

@@ -1,9 +1,14 @@
+import sys
+
 import pytest
 
 from tests.conftest import skip_if_redis_enterprise, skip_ifnot_redis_enterprise
 
 from .conftest import wait_for_command
 
+if sys.version_info[0:2] == (3, 6):
+    pytestmark = pytest.mark.asyncio
+
 
 @pytest.mark.onlynoncluster
 class TestMonitor:

tests/test_asyncio/test_pipeline.py

@@ -1,10 +1,15 @@
+import sys
+
 import pytest
 
 import redis
 from tests.conftest import skip_if_server_version_lt
 
 from .conftest import wait_for_command
 
+if sys.version_info[0:2] == (3, 6):
+    pytestmark = pytest.mark.asyncio
+
 
 class TestPipeline:
     @pytest.mark.onlynoncluster

tests/test_asyncio/test_pubsub.py

@@ -8,6 +8,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio(forbid_global_loop=True)
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_scripting.py

@@ -4,6 +4,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_search.py

@@ -1,6 +1,7 @@
 import bz2
 import csv
 import os
+import sys
 import time
 from io import TextIOWrapper
 
@@ -18,6 +19,10 @@
 from redis.commands.search.suggestion import Suggestion
 from tests.conftest import skip_ifmodversion_lt
 
+if sys.version_info[0:2] == (3, 6):
+    pytestmark = pytest.mark.asyncio
+
+
 WILL_PLAY_TEXT = os.path.abspath(
     os.path.join(os.path.dirname(__file__), "testdata", "will_play_text.csv.bz2")
 )

tests/test_asyncio/test_sentinel.py

@@ -5,6 +5,8 @@
 
 if sys.version_info[0:2] == (3, 6):
     import pytest as pytest_asyncio
+
+    pytestmark = pytest.mark.asyncio
 else:
     import pytest_asyncio
 

tests/test_asyncio/test_timeseries.py

@@ -1,3 +1,4 @@
+import sys
 import time
 from time import sleep
 
@@ -6,6 +7,9 @@
 import redis.asyncio as redis
 from tests.conftest import skip_ifmodversion_lt
 
+if sys.version_info[0:2] == (3, 6):
+    pytestmark = pytest.mark.asyncio
+
 
 @pytest.mark.redismod
 async def test_create(modclient: redis.Redis):