summary refs log tree commit diff
path: root/tests/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-28 13:33:04 +0000
committerErik Johnston <erik@matrix.org>2019-10-28 13:33:04 +0000
commitd0d8a22c13427cce341dbb7ae1d92d2c0ae709c3 (patch)
tree74b184875219b30a13008d36c6dcdee427e403b1 /tests/util
parentMerge tag 'v1.5.0rc2' into develop (diff)
downloadsynapse-d0d8a22c13427cce341dbb7ae1d92d2c0ae709c3.tar.xz
Quick fix to ensure cache descriptors always return deferreds
Diffstat (limited to 'tests/util')
-rw-r--r--tests/util/caches/test_descriptors.py4
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):