From 58a798444d70edfa65de199c2e6ba5ab2feea297 Mon Sep 17 00:00:00 2001
From: Andrew Brookins <andrew.brookins@redislabs.com>
Date: Fri, 12 Nov 2021 07:56:47 -0800
Subject: [PATCH] Clean up test keys properly

---
 Makefile                 |  4 ++--
 tests/conftest.py        | 23 ++++++++++++++++-------
 tests/test_hash_model.py |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index ea14840..8006cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -57,12 +57,12 @@ lint: $(INSTALL_STAMP) dist
 	$(POETRY) run twine check dist/*
 
 .PHONY: format
-format: $(INSTALL_STAMP) sync redis
+format: $(INSTALL_STAMP) sync
 	$(POETRY) run isort --profile=black --lines-after-imports=2 ./tests/ $(NAME) $(SYNC_NAME)
 	$(POETRY) run black ./tests/ $(NAME) $(SYNC_NAME)
 
 .PHONY: test
-test: $(INSTALL_STAMP) sync
+test: $(INSTALL_STAMP) sync redis
 	REDIS_OM_URL="$(REDIS_OM_URL)" $(POETRY) run pytest -n auto -vv ./tests/ ./tests_sync/ --cov-report term-missing --cov $(NAME) $(SYNC_NAME)
 
 .PHONY: test_oss
diff --git a/tests/conftest.py b/tests/conftest.py
index 2a7c799..40be0f9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,6 +6,9 @@ import pytest
 from aredis_om import get_redis_connection
 
 
+TEST_PREFIX = "redis-om:testing"
+
+
 @pytest.fixture(scope="session")
 def event_loop(request):
     """
@@ -22,20 +25,26 @@ def redis():
     yield get_redis_connection()
 
 
-async def _delete_test_keys(prefix: str, conn):
+def _delete_test_keys(prefix: str, conn):
     keys = []
-    async for key in conn.scan_iter(f"{prefix}:*"):
+    for key in conn.scan_iter(f"{prefix}:*"):
         keys.append(key)
     if keys:
         conn.delete(*keys)
 
 
 @pytest.fixture
-def key_prefix(redis):
-    key_prefix = f"redis-om:{random.random()}"
+def key_prefix(request, redis):
+    key_prefix = f"{TEST_PREFIX}:{random.random()}"
     yield key_prefix
 
 
-@pytest.fixture(autouse=True)
-async def delete_test_keys(redis, request, key_prefix):
-    await _delete_test_keys(key_prefix, redis)
+@pytest.fixture(scope="session", autouse=True)
+def cleanup_keys(request):
+    def cleanup_keys():
+        # Always use the sync Redis connection with finalizer. Setting up an
+        # async finalizer should work, but I'm not suer how yet!
+        from redis_om.connections import get_redis_connection as get_sync_redis
+        _delete_test_keys(TEST_PREFIX, get_sync_redis())
+
+    request.addfinalizer(cleanup_keys)
diff --git a/tests/test_hash_model.py b/tests/test_hash_model.py
index 4a3bbb0..5515a64 100644
--- a/tests/test_hash_model.py
+++ b/tests/test_hash_model.py
@@ -432,7 +432,7 @@ async def test_access_result_by_index_not_cached(members, m):
     assert await query.get_item(2) == member3
 
 
-def test_schema(m, key_prefix):
+def test_schema(m):
     class Address(m.BaseHashModel):
         a_string: str = Field(index=True)
         a_full_text_string: str = Field(index=True, full_text_search=True)