diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2018-08-24 11:44:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 11:44:26 -0400 |
| commit | 83caead95a921b0977164468a52c5c0b6e9eee5a (patch) | |
| tree | e87ae6c5d439de1e1dfd7598cab35a14e320ef59 /tests/storage/test__base.py | |
| parent | allow session_data to be any JSON instead of just a string (diff) | |
| parent | Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags (diff) | |
| download | synapse-83caead95a921b0977164468a52c5c0b6e9eee5a.tar.xz | |
Merge branch 'develop' into e2e_backups
Diffstat (limited to 'tests/storage/test__base.py')
| -rw-r--r-- | tests/storage/test__base.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/storage/test__base.py b/tests/storage/test__base.py index 6d6f00c5c5..52eb05bfbf 100644 --- a/tests/storage/test__base.py +++ b/tests/storage/test__base.py @@ -18,14 +18,13 @@ from mock import Mock from twisted.internet import defer -from synapse.util.async import ObservableDeferred +from synapse.util.async_helpers import ObservableDeferred from synapse.util.caches.descriptors import Cache, cached from tests import unittest class CacheTestCase(unittest.TestCase): - def setUp(self): self.cache = Cache("test") @@ -97,7 +96,6 @@ class CacheTestCase(unittest.TestCase): class CacheDecoratorTestCase(unittest.TestCase): - @defer.inlineCallbacks def test_passthrough(self): class A(object): @@ -180,8 +178,7 @@ class CacheDecoratorTestCase(unittest.TestCase): yield a.func(k) self.assertTrue( - callcount[0] >= 14, - msg="Expected callcount >= 14, got %d" % (callcount[0]) + callcount[0] >= 14, msg="Expected callcount >= 14, got %d" % (callcount[0]) ) def test_prefill(self): |