summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-04-08 15:40:37 +0100
committerGitHub <noreply@github.com>2019-04-08 15:40:37 +0100
commit67d7b4478404138c823e0b55d628b791dec1964f (patch)
tree30c7df1cb548f30917a53d09ee060c9556fd5f6c /tests
parentdrop tables listed in #1830 (#4992) (diff)
parentFix from_server buglet in get_keys_from_perspectives (diff)
downloadsynapse-67d7b4478404138c823e0b55d628b791dec1964f.tar.xz
Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys
Fix from_server buglet in get_keys_from_perspectives
Diffstat (limited to 'tests')
-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)