summary refs log tree commit diff
path: root/tests/crypto/test_keyring.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-04-03 16:21:12 +0100
committerRichard van der Hoff <richard@matrix.org>2019-04-08 12:51:16 +0100
commit7d2a0c848ea1ab22c039e94f5d0bb6ec2f08dd58 (patch)
tree8b08330a4b889c096480a32a40603ff7ce27c72e /tests/crypto/test_keyring.py
parentMerge pull request #5001 from matrix-org/rav/keyring_cleanups (diff)
downloadsynapse-7d2a0c848ea1ab22c039e94f5d0bb6ec2f08dd58.tar.xz
Fix from_server buglet in get_keys_from_perspectives
make sure we store the name of the server the keys came from, rather than the
origin server, after doing a fetch-from-perspectives.
Diffstat (limited to 'tests/crypto/test_keyring.py')
-rw-r--r--tests/crypto/test_keyring.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/crypto/test_keyring.py b/tests/crypto/test_keyring.py
index b224fdb23a..9af0656a83 100644
--- a/tests/crypto/test_keyring.py
+++ b/tests/crypto/test_keyring.py
@@ -324,6 +324,7 @@ class KeyringTestCase(unittest.HomeserverTestCase):
         self.assertEqual(len(res), 1)
         res = res[0]
         self.assertEqual(res["key_id"], testverifykey_id)
+        self.assertEqual(res["from_server"], self.mock_perspective_server.server_name)
         self.assertEqual(res["ts_added_ms"], self.reactor.seconds() * 1000)
         self.assertEqual(res["ts_valid_until_ms"], VALID_UNTIL_TS)