More test updates

Author: strawgate

key-value/key-value-aio/src/key_value/aio/stores/vault/store.py

@@ -120,10 +120,13 @@ async def _delete_managed_entry(self, *, key: str, collection: str) -> bool:
         combo_key: str = compound_key(collection=collection, key=key)
 
         try:
+            # Vault doesnt tell us if the delete was successful so we read the entry and if it exists before we call delete,
+            # we count it as a deletion.
+            entry = self._kv_v2.read_secret(path=combo_key, mount_point=self._mount_point)  # pyright: ignore[reportUnknownMemberType,reportUnknownVariableType]
             self._kv_v2.delete_metadata_and_all_versions(path=combo_key, mount_point=self._mount_point)  # pyright: ignore[reportUnknownMemberType]
         except InvalidPath:
             return False
         except Exception:
             return False
 
-        return True
+        return entry is not None

key-value/key-value-aio/tests/stores/base.py

@@ -116,6 +116,14 @@ async def test_put_many_tuple_get_many(self, store: BaseStore):
         await store.put_many(collection="test", keys=["test", "test_2"], values=({"test": "test"}, {"test": "test_2"}))
         assert await store.get_many(collection="test", keys=["test", "test_2"]) == [{"test": "test"}, {"test": "test_2"}]
 
+    async def test_delete(self, store: BaseStore):
+        assert await store.delete(collection="test", key="test") is False
+
+    async def test_put_delete_delete(self, store: BaseStore):
+        await store.put(collection="test", key="test", value={"test": "test"})
+        assert await store.delete(collection="test", key="test")
+        assert await store.delete(collection="test", key="test") is False
+
     async def test_delete_many(self, store: BaseStore):
         assert await store.delete_many(collection="test", keys=["test", "test_2"]) == 0
 

key-value/key-value-aio/tests/stores/keyring/test_keyring.py

@@ -17,7 +17,7 @@ class TestKeychainStore(BaseStoreTests):
     async def store(self) -> KeyringStore:
         # Use a test-specific service name to avoid conflicts
         store = KeyringStore(service_name="py-key-value-test")
-        await store.delete_many(collection="test", keys=["test"])
+        await store.delete_many(collection="test", keys=["test", "test_2"])
         await store.delete_many(collection="test_collection", keys=["test_key"])
 
         return store

key-value/key-value-sync/src/key_value/sync/code_gen/stores/vault/store.py

@@ -117,10 +117,13 @@ def _delete_managed_entry(self, *, key: str, collection: str) -> bool:
         combo_key: str = compound_key(collection=collection, key=key)
 
         try:
+            # Vault doesnt tell us if the delete was successful so we read the entry and if it exists before we call delete,
+            # we count it as a deletion.
+            entry = self._kv_v2.read_secret(path=combo_key, mount_point=self._mount_point)  # pyright: ignore[reportUnknownMemberType,reportUnknownVariableType]
             self._kv_v2.delete_metadata_and_all_versions(path=combo_key, mount_point=self._mount_point)  # pyright: ignore[reportUnknownMemberType]
         except InvalidPath:
             return False
         except Exception:
             return False
 
-        return True
+        return entry is not None

key-value/key-value-sync/tests/code_gen/stores/base.py

@@ -113,6 +113,14 @@ def test_put_many_tuple_get_many(self, store: BaseStore):
         store.put_many(collection="test", keys=["test", "test_2"], values=({"test": "test"}, {"test": "test_2"}))
         assert store.get_many(collection="test", keys=["test", "test_2"]) == [{"test": "test"}, {"test": "test_2"}]
 
+    def test_delete(self, store: BaseStore):
+        assert store.delete(collection="test", key="test") is False
+
+    def test_put_delete_delete(self, store: BaseStore):
+        store.put(collection="test", key="test", value={"test": "test"})
+        assert store.delete(collection="test", key="test")
+        assert store.delete(collection="test", key="test") is False
+
     def test_delete_many(self, store: BaseStore):
         assert store.delete_many(collection="test", keys=["test", "test_2"]) == 0
 

key-value/key-value-sync/tests/code_gen/stores/keyring/test_keyring.py

@@ -20,7 +20,7 @@ class TestKeychainStore(BaseStoreTests):
     def store(self) -> KeyringStore:
         # Use a test-specific service name to avoid conflicts
         store = KeyringStore(service_name="py-key-value-test")
-        store.delete_many(collection="test", keys=["test"])
+        store.delete_many(collection="test", keys=["test", "test_2"])
         store.delete_many(collection="test_collection", keys=["test_key"])
 
         return store