diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-10-16 12:34:55 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-10-21 15:39:25 +0100 |
| commit | 1f4269700c2353263a605856f28ded28501368e1 (patch) | |
| tree | 7295f1ee0ca491ff765c7ffbe6290bdc8e49d556 /tests/util/caches/test_descriptors.py | |
| parent | Combine the two sets of tests for CacheDescriptor (diff) | |
| download | synapse-1f4269700c2353263a605856f28ded28501368e1.tar.xz | |
Push some deferred wrangling down into DeferredCache
Diffstat (limited to 'tests/util/caches/test_descriptors.py')
| -rw-r--r-- | tests/util/caches/test_descriptors.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py index 3d738afa7f..fc2663c02d 100644 --- a/tests/util/caches/test_descriptors.py +++ b/tests/util/caches/test_descriptors.py @@ -27,7 +27,6 @@ from synapse.logging.context import ( current_context, make_deferred_yieldable, ) -from synapse.util.async_helpers import ObservableDeferred from synapse.util.caches import descriptors from synapse.util.caches.descriptors import cached @@ -419,9 +418,9 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase): a = A() - a.func.prefill(("foo",), ObservableDeferred(d)) + a.func.prefill(("foo",), 456) - self.assertEquals(a.func("foo").result, d.result) + self.assertEquals(a.func("foo").result, 456) self.assertEquals(callcount[0], 0) @defer.inlineCallbacks |