Try to get Windows tests passing

Author: strawgate

key-value/key-value-aio/tests/stores/disk/test_disk.py

@@ -1,6 +1,7 @@
 import json
 import tempfile
 from collections.abc import AsyncGenerator
+from pathlib import Path
 
 import pytest
 from dirty_equals import IsDatetime
@@ -15,21 +16,24 @@
 
 
 class TestDiskStore(ContextManagerStoreTestMixin, BaseStoreTests):
-    @pytest.fixture(scope="session")
-    async def disk_store(self) -> AsyncGenerator[DiskStore, None]:
+    @pytest.fixture(scope="class")
+    async def disk_path(self) -> AsyncGenerator[Path, None]:
         with tempfile.TemporaryDirectory() as temp_dir:
-            yield DiskStore(directory=temp_dir, max_size=TEST_SIZE_LIMIT)
+            yield Path(temp_dir)
 
     @override
     @pytest.fixture
-    async def store(self, disk_store: DiskStore) -> DiskStore:
+    async def store(self, disk_path: Path) -> DiskStore:
+        disk_store = DiskStore(directory=disk_path, max_size=TEST_SIZE_LIMIT)
+
         disk_store._cache.clear()  # pyright: ignore[reportPrivateUsage]
 
         return disk_store
 
     @pytest.fixture
-    async def disk_cache(self, disk_store: DiskStore) -> Cache:
-        return disk_store._cache  # pyright: ignore[reportPrivateUsage]
+    async def disk_cache(self, store: DiskStore) -> Cache:
+        assert isinstance(store._cache, Cache)
+        return store._cache  # pyright: ignore[reportPrivateUsage]
 
     async def test_value_stored(self, store: DiskStore, disk_cache: Cache):
         await store.put(collection="test", key="test_key", value={"name": "Alice", "age": 30})

key-value/key-value-aio/tests/stores/disk/test_multi_disk.py

@@ -19,18 +19,21 @@
 
 
 class TestMultiDiskStore(ContextManagerStoreTestMixin, BaseStoreTests):
-    @pytest.fixture(scope="session")
-    async def multi_disk_store(self) -> AsyncGenerator[MultiDiskStore, None]:
-        with tempfile.TemporaryDirectory() as temp_dir:
-            yield MultiDiskStore(base_directory=Path(temp_dir), max_size=TEST_SIZE_LIMIT)
+    @pytest.fixture
+    async def multi_disk_path(self) -> AsyncGenerator[Path, None]:
+        with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as temp_dir:
+            yield Path(temp_dir)
 
     @override
     @pytest.fixture
-    async def store(self, multi_disk_store: MultiDiskStore) -> MultiDiskStore:
-        for collection in multi_disk_store._cache:  # pyright: ignore[reportPrivateUsage]
-            multi_disk_store._cache[collection].clear()  # pyright: ignore[reportPrivateUsage]
+    async def store(self, multi_disk_path: Path) -> AsyncGenerator[MultiDiskStore, None]:
+        store = MultiDiskStore(base_directory=multi_disk_path, max_size=TEST_SIZE_LIMIT)
+
+        yield store
 
-        return multi_disk_store
+        # Wipe the store after returning it
+        for collection in store._cache:  # pyright: ignore[reportPrivateUsage]
+            store._cache[collection].clear()  # pyright: ignore[reportPrivateUsage]
 
     async def test_value_stored(self, store: MultiDiskStore):
         await store.put(collection="test", key="test_key", value={"name": "Alice", "age": 30})

key-value/key-value-aio/tests/stores/rocksdb/test_rocksdb.py

@@ -16,7 +16,7 @@
 
 @pytest.mark.filterwarnings("ignore:A configured store is unstable and may change in a backwards incompatible way. Use at your own risk.")
 class TestRocksDBStore(ContextManagerStoreTestMixin, BaseStoreTests):
-    @pytest.fixture(scope="session")
+    @pytest.fixture(scope="class")
     async def rocksdb_path(self) -> AsyncGenerator[Path, None]:
         with TemporaryDirectory() as temp_dir:
             db_path = Path(temp_dir) / "test_db"

key-value/key-value-sync/tests/code_gen/stores/disk/test_disk.py

@@ -4,6 +4,7 @@
 import json
 import tempfile
 from collections.abc import Generator
+from pathlib import Path
 
 import pytest
 from dirty_equals import IsDatetime
@@ -18,21 +19,24 @@
 
 
 class TestDiskStore(ContextManagerStoreTestMixin, BaseStoreTests):
-    @pytest.fixture(scope="session")
-    def disk_store(self) -> Generator[DiskStore, None, None]:
+    @pytest.fixture(scope="class")
+    def disk_path(self) -> Generator[Path, None, None]:
         with tempfile.TemporaryDirectory() as temp_dir:
-            yield DiskStore(directory=temp_dir, max_size=TEST_SIZE_LIMIT)
+            yield Path(temp_dir)
 
     @override
     @pytest.fixture
-    def store(self, disk_store: DiskStore) -> DiskStore:
+    def store(self, disk_path: Path) -> DiskStore:
+        disk_store = DiskStore(directory=disk_path, max_size=TEST_SIZE_LIMIT)
+
         disk_store._cache.clear()  # pyright: ignore[reportPrivateUsage]
 
         return disk_store
 
     @pytest.fixture
-    def disk_cache(self, disk_store: DiskStore) -> Cache:
-        return disk_store._cache  # pyright: ignore[reportPrivateUsage]
+    def disk_cache(self, store: DiskStore) -> Cache:
+        assert isinstance(store._cache, Cache)
+        return store._cache  # pyright: ignore[reportPrivateUsage]
 
     def test_value_stored(self, store: DiskStore, disk_cache: Cache):
         store.put(collection="test", key="test_key", value={"name": "Alice", "age": 30})

key-value/key-value-sync/tests/code_gen/stores/disk/test_multi_disk.py

@@ -22,18 +22,21 @@
 
 
 class TestMultiDiskStore(ContextManagerStoreTestMixin, BaseStoreTests):
-    @pytest.fixture(scope="session")
-    def multi_disk_store(self) -> Generator[MultiDiskStore, None, None]:
-        with tempfile.TemporaryDirectory() as temp_dir:
-            yield MultiDiskStore(base_directory=Path(temp_dir), max_size=TEST_SIZE_LIMIT)
+    @pytest.fixture
+    def multi_disk_path(self) -> Generator[Path, None, None]:
+        with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as temp_dir:
+            yield Path(temp_dir)
 
     @override
     @pytest.fixture
-    def store(self, multi_disk_store: MultiDiskStore) -> MultiDiskStore:
-        for collection in multi_disk_store._cache:  # pyright: ignore[reportPrivateUsage]
-            multi_disk_store._cache[collection].clear()  # pyright: ignore[reportPrivateUsage]
+    def store(self, multi_disk_path: Path) -> Generator[MultiDiskStore, None, None]:
+        store = MultiDiskStore(base_directory=multi_disk_path, max_size=TEST_SIZE_LIMIT)
+
+        yield store
 
-        return multi_disk_store
+        # Wipe the store after returning it
+        for collection in store._cache:  # pyright: ignore[reportPrivateUsage]
+            store._cache[collection].clear()  # pyright: ignore[reportPrivateUsage]
 
     def test_value_stored(self, store: MultiDiskStore):
         store.put(collection="test", key="test_key", value={"name": "Alice", "age": 30})

key-value/key-value-sync/tests/code_gen/stores/rocksdb/test_rocksdb.py

@@ -19,7 +19,7 @@
 
 @pytest.mark.filterwarnings("ignore:A configured store is unstable and may change in a backwards incompatible way. Use at your own risk.")
 class TestRocksDBStore(ContextManagerStoreTestMixin, BaseStoreTests):
-    @pytest.fixture(scope="session")
+    @pytest.fixture(scope="class")
     def rocksdb_path(self) -> Generator[Path, None, None]:
         with TemporaryDirectory() as temp_dir:
             db_path = Path(temp_dir) / "test_db"