summary refs log tree commit diff
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-08-01 22:09:05 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-08-01 22:09:05 -0400
commit8c9adcc95dee892f90d6acbbe5c54acbf621720b (patch)
tree3048514e8d3aefad518c732ee1c578f30c566bad
parentadd changelog (diff)
downloadsynapse-8c9adcc95dee892f90d6acbbe5c54acbf621720b.tar.xz
fix formatting
-rw-r--r--changelog.d/5769.feature2
-rw-r--r--tests/handlers/test_e2e_keys.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/5769.feature b/changelog.d/5769.feature

index c34257cb8f..bf994ca327 100644 --- a/changelog.d/5769.feature +++ b/changelog.d/5769.feature
@@ -1 +1 @@ -allow uploading of cross-signing keys \ No newline at end of file +Allow uploading of cross-signing keys. \ No newline at end of file diff --git a/tests/handlers/test_e2e_keys.py b/tests/handlers/test_e2e_keys.py
index 9ae4cb6ea2..a62c52eefa 100644 --- a/tests/handlers/test_e2e_keys.py +++ b/tests/handlers/test_e2e_keys.py
@@ -176,7 +176,9 @@ class E2eKeysHandlerTestCase(unittest.TestCase): } yield self.handler.upload_signing_keys_for_user(local_user, keys2) - devices = yield self.handler.query_devices({"device_keys": {local_user: []}}, 0, local_user) + devices = yield self.handler.query_devices( + {"device_keys": {local_user: []}}, 0, local_user + ) self.assertDictEqual(devices["master_keys"], {local_user: keys2["master_key"]}) @defer.inlineCallbacks