diff options
| author | Erik Johnston <erikj@jki.re> | 2017-03-31 10:10:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 10:10:56 +0100 |
| commit | 9cee0ce7dbbf34edc8542b4b02e36ab978da2715 (patch) | |
| tree | 9832e523b67b8bb43e0bd7bbe2f3ceac233e3e1c /tests/util/test_snapshot_cache.py | |
| parent | Merge pull request #2076 from matrix-org/erikj/as_perf (diff) | |
| parent | Remove unused instance variable (diff) | |
| download | synapse-9cee0ce7dbbf34edc8542b4b02e36ab978da2715.tar.xz | |
Merge pull request #2075 from matrix-org/erikj/cache_speed
Speed up cached function access
Diffstat (limited to 'tests/util/test_snapshot_cache.py')
| -rw-r--r-- | tests/util/test_snapshot_cache.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/util/test_snapshot_cache.py b/tests/util/test_snapshot_cache.py index 7e289715ba..d3a8630c2f 100644 --- a/tests/util/test_snapshot_cache.py +++ b/tests/util/test_snapshot_cache.py @@ -53,7 +53,9 @@ class SnapshotCacheTestCase(unittest.TestCase): # before the cache expires returns a resolved deferred. get_result_at_11 = self.cache.get(11, "key") self.assertIsNotNone(get_result_at_11) - self.assertTrue(get_result_at_11.called) + if isinstance(get_result_at_11, Deferred): + # The cache may return the actual result rather than a deferred + self.assertTrue(get_result_at_11.called) # Check that getting the key after the deferred has resolved # after the cache expires returns None |