diff options
author | Erik Johnston <erikj@jki.re> | 2017-01-30 17:56:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-30 17:56:19 +0000 |
commit | 4c9812f5da8ad854e9ec59fc4dfcadecdda70436 (patch) | |
tree | e7daec9cf524079f4c8da6031efb1358168bd20d /tests | |
parent | Merge pull request #1857 from matrix-org/erikj/device_list_stream (diff) | |
parent | Don't have such a large cache (diff) | |
download | synapse-4c9812f5da8ad854e9ec59fc4dfcadecdda70436.tar.xz |
Merge pull request #1861 from matrix-org/erikj/device_list_fixes
Device List fixes
Diffstat (limited to 'tests')
-rw-r--r-- | tests/storage/test_end_to_end_keys.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/storage/test_end_to_end_keys.py b/tests/storage/test_end_to_end_keys.py index bfa6294250..84ce492a2c 100644 --- a/tests/storage/test_end_to_end_keys.py +++ b/tests/storage/test_end_to_end_keys.py @@ -33,7 +33,7 @@ class EndToEndKeyStoreTestCase(tests.unittest.TestCase): @defer.inlineCallbacks def test_key_without_device_name(self): now = 1470174257070 - json = '{ "key": "value" }' + json = {"key": "value"} yield self.store.store_device( "user", "device", None @@ -47,14 +47,14 @@ class EndToEndKeyStoreTestCase(tests.unittest.TestCase): self.assertIn("device", res["user"]) dev = res["user"]["device"] self.assertDictContainsSubset({ - "key_json": json, + "keys": json, "device_display_name": None, }, dev) @defer.inlineCallbacks def test_get_key_with_device_name(self): now = 1470174257070 - json = '{ "key": "value" }' + json = {"key": "value"} yield self.store.set_e2e_device_keys( "user", "device", now, json) @@ -67,7 +67,7 @@ class EndToEndKeyStoreTestCase(tests.unittest.TestCase): self.assertIn("device", res["user"]) dev = res["user"]["device"] self.assertDictContainsSubset({ - "key_json": json, + "keys": json, "device_display_name": "display_name", }, dev) |