diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
| commit | 62b89daac6f4418d831d531fa40ad71aa0c74fb9 (patch) | |
| tree | a5fa797ac7e65f85cae52cccd88451e5672257c6 /tests/util/test_snapshot_cache.py | |
| parent | Always advance stream tokens (diff) | |
| parent | Merge pull request #2095 from matrix-org/rav/cull_log_preserves (diff) | |
| download | synapse-62b89daac6f4418d831d531fa40ad71aa0c74fb9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_server
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 |