|
@@ -18,7 +18,7 @@ def cache():
|
|
def test_add(cache: Cache):
|
|
def test_add(cache: Cache):
|
|
val = 'test-cached-value'
|
|
val = 'test-cached-value'
|
|
key = 'test-key'
|
|
key = 'test-key'
|
|
- assert cache.add(key, CachedLoadingPage(val, lambda _: None)) == val
|
|
|
|
|
|
+ assert cache.add(key, CachedLoadingPage(val, lambda _: None, incremental=False)).value == val
|
|
|
|
|
|
def test_get(cache: Cache):
|
|
def test_get(cache: Cache):
|
|
val = 'test-cached-value'
|
|
val = 'test-cached-value'
|
|
@@ -26,47 +26,47 @@ def test_get(cache: Cache):
|
|
|
|
|
|
assert cache.get(key) is None
|
|
assert cache.get(key) is None
|
|
|
|
|
|
- assert cache.add(key, CachedLoadingPage(val, lambda q: q.put('next-val'))) == val
|
|
|
|
- assert cache.get(key) == 'next-val'
|
|
|
|
|
|
+ assert cache.add(key, CachedLoadingPage(val, lambda q: q.put('next-val'), incremental=False)).value == val
|
|
|
|
+ assert cache.get(key).value == 'next-val'
|
|
|
|
|
|
def test_remove(cache: Cache):
|
|
def test_remove(cache: Cache):
|
|
val = 'test-cached-value'
|
|
val = 'test-cached-value'
|
|
key = 'test-key'
|
|
key = 'test-key'
|
|
|
|
|
|
assert cache.get(key) is None
|
|
assert cache.get(key) is None
|
|
- assert cache.add(key, CachedLoadingPage(val, lambda q: q.put('next-val'))) == val
|
|
|
|
|
|
+ assert cache.add(key, CachedLoadingPage(val, lambda q: q.put('next-val'), incremental=False)).value == val
|
|
cache.remove(key)
|
|
cache.remove(key)
|
|
assert cache.get(key) is None
|
|
assert cache.get(key) is None
|
|
|
|
|
|
def test_enforce_limit(cache: Cache):
|
|
def test_enforce_limit(cache: Cache):
|
|
val = 'test-cached-value'
|
|
val = 'test-cached-value'
|
|
key = 'test-key'
|
|
key = 'test-key'
|
|
- assert cache.add(key, CachedLoadingPage(val, lambda _: None)) == val
|
|
|
|
|
|
+ assert cache.add(key, CachedLoadingPage(val, lambda _: None, incremental=False)).value == val
|
|
# adding more exceeds limit
|
|
# adding more exceeds limit
|
|
- assert cache.add('other', CachedLoadingPage(val, lambda _: None)) == val
|
|
|
|
|
|
+ assert cache.add('other', CachedLoadingPage(val, lambda _: None, incremental=False)).value == val
|
|
assert cache.get(key) is None
|
|
assert cache.get(key) is None
|
|
- assert cache.get('other') == val
|
|
|
|
|
|
+ assert cache.get('other').value == val
|
|
|
|
|
|
def test_clean_stale(cache: Cache):
|
|
def test_clean_stale(cache: Cache):
|
|
val = 'test-cached-value'
|
|
val = 'test-cached-value'
|
|
key = 'test-key'
|
|
key = 'test-key'
|
|
- page = CachedLoadingPage(val, lambda _: None)
|
|
|
|
|
|
+ page = CachedLoadingPage(val, lambda _: None, incremental=False)
|
|
page._created = time() - 10*60
|
|
page._created = time() - 10*60
|
|
# add stale page
|
|
# add stale page
|
|
- assert cache.add(key, page) == val
|
|
|
|
|
|
+ assert cache.add(key, page).value == val
|
|
assert cache.get(key) is None
|
|
assert cache.get(key) is None
|
|
|
|
|
|
- page = CachedLoadingPage(val, lambda _: None)
|
|
|
|
- assert cache.add(key, page) == val
|
|
|
|
|
|
+ page = CachedLoadingPage(val, lambda _: None, incremental=False)
|
|
|
|
+ assert cache.add(key, page).value == val
|
|
# make page stale
|
|
# make page stale
|
|
page._created = time() - 10*60
|
|
page._created = time() - 10*60
|
|
assert cache.get(key) is None
|
|
assert cache.get(key) is None
|
|
|
|
|
|
- page = CachedLoadingPage(val, lambda _: None)
|
|
|
|
- assert cache.add(key, page) == val
|
|
|
|
|
|
+ page = CachedLoadingPage(val, lambda _: None, incremental=False)
|
|
|
|
+ assert cache.add(key, page).value == val
|
|
# make page stale
|
|
# make page stale
|
|
page._created = time() - 10*60
|
|
page._created = time() - 10*60
|
|
# stale page is rotated out on addition
|
|
# stale page is rotated out on addition
|
|
- assert cache.add('other', CachedLoadingPage(val, lambda _: None)) == val
|
|
|
|
|
|
+ assert cache.add('other', CachedLoadingPage(val, lambda _: None, incremental=False)).value == val
|
|
assert cache.get(key) is None
|
|
assert cache.get(key) is None
|
|
- assert cache.get('other') == val
|
|
|
|
|
|
+ assert cache.get('other').value == val
|