Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-07-22 10:50:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge worker apps into one. (#6964)

Browse source
This commit is contained in:
Erik Johnston 2020-02-25 16:56:55 +00:00 • committed by GitHub
parent 4aea0bd292
commit bbf8886a05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 1052 additions and 2327 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/app/test_frontend_proxy.py
View file

@ -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)