diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-08-29 00:14:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-29 00:14:17 +0100 |
commit | 45e8f7726f24d98a9d3fa06ea52ae960cc1d8689 (patch) | |
tree | 73bb447c76d6dbaf48e2362cbcb9aa39e5a73011 /tests | |
parent | Add a comment about _LimitedHostnameResolver (diff) | |
download | synapse-45e8f7726f24d98a9d3fa06ea52ae960cc1d8689.tar.xz |
Rename `get_e2e_device_keys` to better reflect its purpose (#8205)
... and to show that it does something slightly different to `_get_e2e_device_keys_txn`. `include_all_devices` and `include_deleted_devices` were never used (and `include_deleted_devices` was broken, since that would cause `None`s in the result which were not handled in the loop below. Add some typing too.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/storage/test_end_to_end_keys.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/storage/test_end_to_end_keys.py b/tests/storage/test_end_to_end_keys.py index 261bf5b08b..3fc4bb13b6 100644 --- a/tests/storage/test_end_to_end_keys.py +++ b/tests/storage/test_end_to_end_keys.py @@ -37,7 +37,7 @@ class EndToEndKeyStoreTestCase(tests.unittest.TestCase): ) res = yield defer.ensureDeferred( - self.store.get_e2e_device_keys((("user", "device"),)) + self.store.get_e2e_device_keys_for_cs_api((("user", "device"),)) ) self.assertIn("user", res) self.assertIn("device", res["user"]) @@ -76,7 +76,7 @@ class EndToEndKeyStoreTestCase(tests.unittest.TestCase): ) res = yield defer.ensureDeferred( - self.store.get_e2e_device_keys((("user", "device"),)) + self.store.get_e2e_device_keys_for_cs_api((("user", "device"),)) ) self.assertIn("user", res) self.assertIn("device", res["user"]) @@ -108,7 +108,9 @@ class EndToEndKeyStoreTestCase(tests.unittest.TestCase): ) res = yield defer.ensureDeferred( - self.store.get_e2e_device_keys((("user1", "device1"), ("user2", "device2"))) + self.store.get_e2e_device_keys_for_cs_api( + (("user1", "device1"), ("user2", "device2")) + ) ) self.assertIn("user1", res) self.assertIn("device1", res["user1"]) |