Skip to content

Commit 94a5c56

Browse files
committed
fixed py37 failing tests
1 parent 88c6bba commit 94a5c56

File tree

2 files changed

+8
-29
lines changed

2 files changed

+8
-29
lines changed

ellar/common/cache.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import typing as t
2+
import uuid
23
from functools import wraps
34

45
from ellar.cache.interface import ICacheService
@@ -42,10 +43,10 @@ def __init__(
4243

4344
# create extra args
4445
self._cache_service_arg = ExtraEndpointArg(
45-
name="cache_service", annotation=ICacheService, default_value=Provide() # type: ignore
46+
name=f"cache_service_{uuid.uuid4().hex[:4]}", annotation=ICacheService, default_value=Provide() # type: ignore
4647
)
4748
self._context_arg = ExtraEndpointArg(
48-
name="route_context", annotation=IExecutionContext, default_value=Context() # type: ignore
49+
name=f"route_context_{uuid.uuid4().hex[:4]}", annotation=IExecutionContext, default_value=Context() # type: ignore
4950
)
5051
# apply extra_args to endpoint
5152
extra_args(self._cache_service_arg, self._context_arg)(func)

tests/test_cache/pylib_mock.py

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import time
2-
from unittest import mock
32

43
from pylibmc import Client
54

@@ -13,12 +12,8 @@ def __init__(self, *args, **kwargs):
1312

1413
def set(self, *args, **kwargs):
1514
key, value, _time = args
16-
with mock.patch.object(Client, "set") as set_mock:
17-
set_mock.return_value = True
18-
res = super().set(*args, **kwargs)
19-
assert set_mock.call_args.args == args
2015
self._cache[key] = (value, _time)
21-
return res
16+
return True
2217

2318
def get(self, *args, **kwargs):
2419
(key,) = args
@@ -28,11 +23,7 @@ def get(self, *args, **kwargs):
2823
del self._cache[key]
2924
_res = None
3025

31-
with mock.patch.object(Client, "get") as get_mock:
32-
get_mock.return_value = _res[0] if _res else None
33-
res = super().get(*args, **kwargs)
34-
assert get_mock.call_args.args == args
35-
return res
26+
return _res[0] if _res else None
3627

3728
def touch(self, *args, **kwargs):
3829
key, _time = args
@@ -41,12 +32,7 @@ def touch(self, *args, **kwargs):
4132
if _res:
4233
self._cache.update({key: (_res[0], _time)})
4334
value = True
44-
45-
with mock.patch.object(Client, "touch") as touch_mock:
46-
touch_mock.return_value = value
47-
res = super().touch(*args, **kwargs)
48-
assert touch_mock.call_args.args == args
49-
return res
35+
return value
5036

5137
def delete(self, *args, **kwargs):
5238
(key,) = args
@@ -55,15 +41,7 @@ def delete(self, *args, **kwargs):
5541
del self._cache[key]
5642
else:
5743
value = False
58-
with mock.patch.object(Client, "delete") as delete_mock:
59-
delete_mock.return_value = value
60-
res = super().delete(*args, **kwargs)
61-
assert delete_mock.call_args.args == args
62-
return res
44+
return value
6345

6446
def disconnect_all(self, *args, **kwargs):
65-
with mock.patch.object(Client, "disconnect_all") as disconnect_all_mock:
66-
disconnect_all_mock.return_value = None
67-
res = super().disconnect_all(*args, **kwargs)
68-
assert disconnect_all_mock.call_args.args == args
69-
return res
47+
return None

0 commit comments

Comments
 (0)