# -*- coding: utf-8 -*-
# Copyright 2017 Vector Creations Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import signedjson.key

from twisted.internet import defer

import tests.unittest
import tests.utils


class KeyStoreTestCase(tests.unittest.TestCase):

    @defer.inlineCallbacks
    def setUp(self):
        hs = yield tests.utils.setup_test_homeserver(self.addCleanup)
        self.store = hs.get_datastore()

    @defer.inlineCallbacks
    def test_get_server_verify_keys(self):
        key1 = signedjson.key.decode_verify_key_base64(
            "ed25519", "key1", "fP5l4JzpZPq/zdbBg5xx6lQGAAOM9/3w94cqiJ5jPrw"
        )
        key2 = signedjson.key.decode_verify_key_base64(
            "ed25519", "key2", "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
        )
        yield self.store.store_server_verify_key("server1", "from_server", 0, key1)
        yield self.store.store_server_verify_key("server1", "from_server", 0, key2)

        res = yield self.store.get_server_verify_keys(
            "server1", ["ed25519:key1", "ed25519:key2", "ed25519:key3"]
        )

        self.assertEqual(len(res.keys()), 2)
        self.assertEqual(res["ed25519:key1"].version, "key1")
        self.assertEqual(res["ed25519:key2"].version, "key2")

@@ -629,377 +629,35 @@
 ey%0A%0A
-from twisted.internet import defer%0A%0Aimport tests.unittest%0Aimport tests.utils%0A%0A%0Aclass KeyStoreTestCase(tests.unittest.TestCase):%0A%0A    @defer.inlineCallbacks%0A    def setUp(self):%0A        hs = yield tests.utils.setup_test_homeserver(self.addCleanup)%0A        self.store = hs.get_datastore()%0A%0A    @defer.inlineCallbacks%0A    def test_get_server_verify_keys(self):%0A        key
+import tests.unittest%0A%0AKEY_
 1 = 
@@ -693,32 +693,24 @@
 key_base64(%0A
-        
     %22ed25519
@@ -770,29 +770,14 @@
 rw%22%0A
-        )%0A        key
+)%0AKEY_
 2 = 
@@ -817,24 +817,16 @@
 base64(%0A
-        
     %22ed2
@@ -890,37 +890,167 @@
 Yw%22%0A
-        )%0A        yield self.
+)%0A%0A%0Aclass KeyStoreTestCase(tests.unittest.HomeserverTestCase):%0A    def test_get_server_verify_keys(self):%0A        store = self.hs.get_datastore()%0A%0A        d = 
 stor
@@ -1104,19 +1104,20 @@
 er%22, 0, 
-key
+KEY_
 1)%0A     
@@ -1119,27 +1119,48 @@
         
-yield self.
+self.get_success(d)%0A        d = 
 store.st
@@ -1214,23 +1214,23 @@
  0, 
-key
+KEY_
 2)%0A
-%0A
         
 res 
@@ -1229,25 +1229,41 @@
     
-res = yield self.
+self.get_success(d)%0A%0A        d = 
 stor
@@ -1369,16 +1369,50 @@
        )
+%0A        res = self.get_success(d)
 %0A%0A      

Rewrite test_keys as a HomeserverTestCase