diff options
| author | Erik Johnston <erik@matrix.org> | 2020-02-25 16:56:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 16:56:55 +0000 |
| commit | bbf8886a05be6a929556d6f09a1b6ce053a3c403 (patch) | |
| tree | d3747d92a7e15d7470cb7f603dec4ca617bf7f82 /tests/app/test_frontend_proxy.py | |
| parent | contrib/docker: remove quotes for POSTGRES_INITDB_ARGS (#6984) (diff) | |
| download | synapse-bbf8886a05be6a929556d6f09a1b6ce053a3c403.tar.xz | |
Merge worker apps into one. (#6964)
Diffstat (limited to 'tests/app/test_frontend_proxy.py')
| -rw-r--r-- | tests/app/test_frontend_proxy.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/app/test_frontend_proxy.py b/tests/app/test_frontend_proxy.py index 8bdbc608a9..160e55aca9 100644 --- a/tests/app/test_frontend_proxy.py +++ b/tests/app/test_frontend_proxy.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.app.frontend_proxy import FrontendProxyServer +from synapse.app.generic_worker import GenericWorkerServer from tests.unittest import HomeserverTestCase @@ -22,7 +22,7 @@ class FrontendProxyTests(HomeserverTestCase): def make_homeserver(self, reactor, clock): hs = self.setup_test_homeserver( - http_client=None, homeserverToUse=FrontendProxyServer + http_client=None, homeserverToUse=GenericWorkerServer ) return hs @@ -46,9 +46,7 @@ class FrontendProxyTests(HomeserverTestCase): # Grab the resource from the site that was told to listen self.assertEqual(len(self.reactor.tcpServers), 1) site = self.reactor.tcpServers[0][1] - self.resource = ( - site.resource.children[b"_matrix"].children[b"client"].children[b"r0"] - ) + self.resource = site.resource.children[b"_matrix"].children[b"client"] request, channel = self.make_request("PUT", "presence/a/status") self.render(request) @@ -76,9 +74,7 @@ class FrontendProxyTests(HomeserverTestCase): # Grab the resource from the site that was told to listen self.assertEqual(len(self.reactor.tcpServers), 1) site = self.reactor.tcpServers[0][1] - self.resource = ( - site.resource.children[b"_matrix"].children[b"client"].children[b"r0"] - ) + self.resource = site.resource.children[b"_matrix"].children[b"client"] request, channel = self.make_request("PUT", "presence/a/status") self.render(request) |