Skip to content

Commit c7a123d

Browse files
committed
clear() returns a value
1 parent 508e0c8 commit c7a123d

File tree

2 files changed

+30
-16
lines changed

2 files changed

+30
-16
lines changed

tests/test_backend.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -790,14 +790,6 @@ def test_touch_default_timeout(self, cache: ValkeyCache):
790790
time.sleep(2)
791791
assert cache.get("test_key") == "foo"
792792

793-
def test_clear(self, cache: ValkeyCache):
794-
cache.set("foo", "bar")
795-
value_from_cache = cache.get("foo")
796-
assert value_from_cache == "bar"
797-
cache.clear()
798-
value_from_cache_after_clear = cache.get("foo")
799-
assert value_from_cache_after_clear is None
800-
801793
def test_hset(self, cache: ValkeyCache):
802794
if isinstance(cache.client, ShardClient):
803795
pytest.skip("ShardClient doesn't support get_client")
@@ -1082,3 +1074,19 @@ def test_sunionstore(self, cache: ValkeyCache):
10821074
cache.sadd("foo2", "bar2", "bar3")
10831075
assert cache.sunionstore("foo3", "foo1", "foo2") == 3
10841076
assert cache.smembers("foo3") == {"bar1", "bar2", "bar3"}
1077+
1078+
def test_clear(self, cache: ValkeyCache):
1079+
cache.set("foo", "bar")
1080+
value_from_cache = cache.get("foo")
1081+
assert value_from_cache == "bar"
1082+
cache.clear()
1083+
value_from_cache_after_clear = cache.get("foo")
1084+
assert value_from_cache_after_clear is None
1085+
1086+
def test_clear_true(self, cache: ValkeyCache):
1087+
if isinstance(cache.client, ShardClient):
1088+
pytest.skip("ShardClient doesn't return on clear")
1089+
cache.set("foo", "bar")
1090+
assert cache.get("foo") == "bar"
1091+
assert cache.clear() is True
1092+
assert cache.get("foo") is None

tests/tests_async/test_backend.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -813,14 +813,6 @@ async def test_touch_default_timeout(self, cache: AsyncValkeyCache):
813813
await asyncio.sleep(2)
814814
assert await cache.aget("test_key") == "foo"
815815

816-
async def test_clear(self, cache: AsyncValkeyCache):
817-
await cache.aset("foo", "bar")
818-
value_from_cache = await cache.aget("foo")
819-
assert value_from_cache == "bar"
820-
await cache.aclear()
821-
value_from_cache_after_clear = await cache.aget("foo")
822-
assert value_from_cache_after_clear is None
823-
824816
async def test_hset(self, cache: AsyncValkeyCache):
825817
# if isinstance(cache.client, ShardClient):
826818
# pytest.skip("ShardClient doesn't support get_client")
@@ -1044,3 +1036,17 @@ async def test_sunionstore(self, cache: AsyncValkeyCache):
10441036
await cache.asadd("foo2", "bar2", "bar3")
10451037
assert await cache.asunionstore("foo3", "foo1", "foo2") == 3
10461038
assert await cache.asmembers("foo3") == {"bar1", "bar2", "bar3"}
1039+
1040+
async def test_clear(self, cache: AsyncValkeyCache):
1041+
await cache.aset("foo", "bar")
1042+
value_from_cache = await cache.aget("foo")
1043+
assert value_from_cache == "bar"
1044+
await cache.aclear()
1045+
value_from_cache_after_clear = await cache.aget("foo")
1046+
assert value_from_cache_after_clear is None
1047+
1048+
async def test_clear_true(self, cache: AsyncValkeyCache):
1049+
await cache.aset("foo", "bar")
1050+
assert await cache.aget("foo") == "bar"
1051+
assert await cache.aclear() is True
1052+
assert await cache.aget("foo") is None

0 commit comments

Comments
 (0)