summary refs log tree commit diff
path: root/tests/storage/test_end_to_end_keys.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-05-13 15:01:58 -0500
committerAmber Brown <hawkowl@atleastfornow.net>2019-05-13 15:01:58 -0500
commita1b8767da85794eb24e3b9fbce1aed87a04ea328 (patch)
treefd32dadee1bcd78d34de73c5398390c26a7cd974 /tests/storage/test_end_to_end_keys.py
parentMerge remote-tracking branch 'origin/develop' into shhs (diff)
parentMigrate all tests to use the dict-based config format instead of hanging item... (diff)
downloadsynapse-a1b8767da85794eb24e3b9fbce1aed87a04ea328.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'tests/storage/test_end_to_end_keys.py')
-rw-r--r--tests/storage/test_end_to_end_keys.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/storage/test_end_to_end_keys.py b/tests/storage/test_end_to_end_keys.py

index 11fb8c0c19..cd2bcd4ca3 100644 --- a/tests/storage/test_end_to_end_keys.py +++ b/tests/storage/test_end_to_end_keys.py
@@ -20,7 +20,6 @@ import tests.utils class EndToEndKeyStoreTestCase(tests.unittest.TestCase): - @defer.inlineCallbacks def setUp(self): hs = yield tests.utils.setup_test_homeserver(self.addCleanup)