diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-30 14:06:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 14:06:34 +0100 |
| commit | e5c3a990916bf0508f705be599f6d0bcb3c20d59 (patch) | |
| tree | 6535228ec5c1325bc9f0d89a750bda250416e707 /tests/storage | |
| parent | Modify doc to update Google ReCaptcha terms (#6257) (diff) | |
| parent | Clarify docstring (diff) | |
| download | synapse-e5c3a990916bf0508f705be599f6d0bcb3c20d59.tar.xz | |
Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor
Make ObservableDeferred.observe() always return deferred.
Diffstat (limited to 'tests/storage')
| -rw-r--r-- | tests/storage/test__base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test__base.py b/tests/storage/test__base.py index dd49a14524..9b81b536f5 100644 --- a/tests/storage/test__base.py +++ b/tests/storage/test__base.py @@ -197,7 +197,7 @@ class CacheDecoratorTestCase(unittest.TestCase): a.func.prefill(("foo",), ObservableDeferred(d)) - self.assertEquals(a.func("foo"), d.result) + self.assertEquals(a.func("foo").result, d.result) self.assertEquals(callcount[0], 0) @defer.inlineCallbacks |