diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-11-16 18:21:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 18:21:47 +0000 |
| commit | f125895475aeee9447f3988ecbd8bfd1836545bf (patch) | |
| tree | c8089efeb11c3707e6b5cc23a825d794c94728fb /tests/rest | |
| parent | Generalise _locally_reject_invite (#8751) (diff) | |
| download | synapse-f125895475aeee9447f3988ecbd8bfd1836545bf.tar.xz | |
Move `wait_until_result` into `FakeChannel` (#8758)
FakeChannel has everything we need, and this more accurately models the real flow.
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/key/v2/test_remote_key_resource.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/rest/key/v2/test_remote_key_resource.py b/tests/rest/key/v2/test_remote_key_resource.py index 6671cbd32d..fbcf8d5b86 100644 --- a/tests/rest/key/v2/test_remote_key_resource.py +++ b/tests/rest/key/v2/test_remote_key_resource.py @@ -32,7 +32,7 @@ from synapse.util.httpresourcetree import create_resource_tree from synapse.util.stringutils import random_string from tests import unittest -from tests.server import FakeChannel, wait_until_result +from tests.server import FakeChannel from tests.utils import default_config @@ -94,7 +94,7 @@ class RemoteKeyResourceTestCase(BaseRemoteKeyResourceTestCase): % (server_name.encode("utf-8"), key_id.encode("utf-8")), b"1.1", ) - wait_until_result(self.reactor, req) + channel.await_result() self.assertEqual(channel.code, 200) resp = channel.json_body return resp @@ -190,7 +190,7 @@ class EndToEndPerspectivesTests(BaseRemoteKeyResourceTestCase): req.requestReceived( b"POST", path.encode("utf-8"), b"1.1", ) - wait_until_result(self.reactor, req) + channel.await_result() self.assertEqual(channel.code, 200) resp = channel.json_body return resp |