diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-29 12:53:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 12:53:21 +0100 |
| commit | 561133c3c5fe5789c340ccac395b830e12a3c2b9 (patch) | |
| tree | f10f22ea8f939815590d11a44ee308411bccd401 /tests | |
| parent | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Update docstring (diff) | |
| download | synapse-561133c3c5fe5789c340ccac395b830e12a3c2b9.tar.xz | |
Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds
Quick fix to ensure cache descriptors always return deferreds
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/util/caches/test_descriptors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py index 5713870f48..f907903511 100644 --- a/tests/util/caches/test_descriptors.py +++ b/tests/util/caches/test_descriptors.py @@ -325,9 +325,9 @@ class DescriptorTestCase(unittest.TestCase): self.assertEqual(len(obj.fn.cache.cache), 3) r = obj.fn(1, 2) - self.assertEqual(r, ["spam", "eggs"]) + self.assertEqual(r.result, ["spam", "eggs"]) r = obj.fn(1, 3) - self.assertEqual(r, ["chips"]) + self.assertEqual(r.result, ["chips"]) obj.mock.assert_not_called() def test_cache_iterable_with_sync_exception(self): |