Implement temporary workaround from unasync package

Author: moznuy

make_sync.py

@@ -1,6 +1,5 @@
 import os
 from pathlib import Path
-from typing import Iterable, Optional, Union
 
 import unasync
 
@@ -9,44 +8,9 @@
     "aioredis": "redis",
     ":tests.": ":tests_sync.",
     "pytest_asyncio": "pytest",
+    "py_test_mark_asyncio": "py_test_mark_sync",
 }
 
-STRINGS_TO_REMOVE_FROM_SYNC_TESTS = {
-    "@pytest.mark.asyncio",
-}
-
-
-def remove_strings_from_files(
-    filepaths: Iterable[Union[bytes, str, os.PathLike]],
-    strings_to_remove: Iterable[str],
-):
-    for filepath in filepaths:
-        tmp_filepath = f"{filepath}.tmp"
-        with open(filepath, "r") as read_file, open(tmp_filepath, "w") as write_file:
-            for line in read_file:
-                if line.strip() in strings_to_remove:
-                    continue
-                print(line, end="", file=write_file)
-        os.replace(tmp_filepath, filepath)
-
-
-def get_source_filepaths(directory: Optional[Union[bytes, str, os.PathLike]] = None):
-    walk_path = (
-        Path(__file__).absolute().parent
-        if directory is None
-        else os.path.join(Path(__file__).absolute().parent, directory)
-    )
-
-    filepaths = []
-    for root, _, filenames in os.walk(walk_path):
-        for filename in filenames:
-            if filename.rpartition(".")[-1] in (
-                "py",
-                "pyi",
-            ):
-                filepaths.append(os.path.join(root, filename))
-    return filepaths
-
 
 def main():
     rules = [
@@ -61,11 +25,15 @@ def main():
             additional_replacements=ADDITIONAL_REPLACEMENTS,
         ),
     ]
+    filepaths = []
+    for root, _, filenames in os.walk(
+            Path(__file__).absolute().parent
+    ):
+        for filename in filenames:
+            if filename.rpartition(".")[-1] in ("py", "pyi",):
+                filepaths.append(os.path.join(root, filename))
 
-    unasync.unasync_files(get_source_filepaths(), rules)
-    remove_strings_from_files(
-        get_source_filepaths("tests_sync"), STRINGS_TO_REMOVE_FROM_SYNC_TESTS
-    )
+    unasync.unasync_files(filepaths, rules)
 
 
 if __name__ == "__main__":

tests/conftest.py

@@ -9,6 +9,14 @@
 TEST_PREFIX = "redis-om:testing"
 
 
+py_test_mark_asyncio = pytest.mark.asyncio
+
+
+# "pytest_mark_sync" causes problem in pytest
+def py_test_mark_sync(f):
+    return f  # no-op decorator
+
+
 @pytest.fixture(scope="session")
 def event_loop(request):
     loop = asyncio.get_event_loop_policy().new_event_loop()

tests/test_hash_model.py

@@ -23,7 +23,7 @@
 # We need to run this check as sync code (during tests) even in async mode
 # because we call it in the top-level module scope.
 from redis_om import has_redisearch
-
+from tests.conftest import py_test_mark_asyncio
 
 if not has_redisearch():
     pytestmark = pytest.mark.skip
@@ -96,7 +96,7 @@ async def members(m):
     yield member1, member2, member3
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_exact_match_queries(members, m):
     member1, member2, member3 = members
 
@@ -130,7 +130,7 @@ async def test_exact_match_queries(members, m):
     assert actual == [member2]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_full_text_search_queries(members, m):
     member1, member2, member3 = members
 
@@ -143,7 +143,7 @@ async def test_full_text_search_queries(members, m):
     assert actual == [member1, member3]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_recursive_query_resolution(members, m):
     member1, member2, member3 = members
 
@@ -158,7 +158,7 @@ async def test_recursive_query_resolution(members, m):
     assert actual == [member2, member1, member3]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_tag_queries_boolean_logic(members, m):
     member1, member2, member3 = members
 
@@ -173,7 +173,7 @@ async def test_tag_queries_boolean_logic(members, m):
     assert actual == [member1, member3]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_tag_queries_punctuation(m):
     member1 = m.Member(
         first_name="Andrew, the Michael",
@@ -211,7 +211,7 @@ async def test_tag_queries_punctuation(m):
     assert results == [member2]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_tag_queries_negation(members, m):
     member1, member2, member3 = members
 
@@ -283,7 +283,7 @@ async def test_tag_queries_negation(members, m):
     assert actual == [member3]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_numeric_queries(members, m):
     member1, member2, member3 = members
 
@@ -314,7 +314,7 @@ async def test_numeric_queries(members, m):
     assert actual == [member2, member1]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_sorting(members, m):
     member1, member2, member3 = members
 
@@ -359,7 +359,7 @@ def test_validation_passes(m):
     assert member.first_name == "Andrew"
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_retrieve_first(m):
     member = m.Member(
         first_name="Simon",
@@ -398,7 +398,7 @@ async def test_retrieve_first(m):
     assert first_one == member3
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_saves_model_and_creates_pk(m):
     member = m.Member(
         first_name="Andrew",
@@ -415,7 +415,7 @@ async def test_saves_model_and_creates_pk(m):
     assert member2 == member
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_all_pks(m):
     member = m.Member(
         first_name="Simon",
@@ -446,7 +446,7 @@ async def test_all_pks(m):
     assert len(pk_list) == 2
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_delete(m):
     member = m.Member(
         first_name="Simon",
@@ -462,7 +462,7 @@ async def test_delete(m):
     assert response == 1
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_expire(m):
     member = m.Member(
         first_name="Expire",
@@ -526,7 +526,7 @@ class InvalidMember(m.BaseHashModel):
             friend_ids: List[str]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_saves_many(m):
     member1 = m.Member(
         first_name="Andrew",
@@ -552,22 +552,22 @@ async def test_saves_many(m):
     assert await m.Member.get(pk=member2.pk) == member2
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_updates_a_model(members, m):
     member1, member2, member3 = members
     await member1.update(last_name="Smith")
     member = await m.Member.get(member1.pk)
     assert member.last_name == "Smith"
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_paginate_query(members, m):
     member1, member2, member3 = members
     actual = await m.Member.find().sort_by("age").all(batch_size=1)
     assert actual == [member2, member1, member3]
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_access_result_by_index_cached(members, m):
     member1, member2, member3 = members
     query = m.Member.find().sort_by("age")
@@ -582,7 +582,7 @@ async def test_access_result_by_index_cached(members, m):
         assert not mock_db.called
 
 
-@pytest.mark.asyncio
+@py_test_mark_asyncio
 async def test_access_result_by_index_not_cached(members, m):
     member1, member2, member3 = members
     query = m.Member.find().sort_by("age")