OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix wonky tests 

@erikjohnston is amazeballs and figured it out!
hs/push-reports-to-as
Will Hunt 2020-10-02 15:00:19 +01:00
parent c30c38cb6a
commit faa169cc59
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/appservice/scheduler.py
View File

@ -119,7 +119,7 @@ class _ServiceQueuer:
return return
run_as_background_process( run_as_background_process(
"as-sender-%s" % (service.id), self._send_request, service "as-sender-%s" % (service.id,), self._send_request, service
) )
def enqueue_ephemeral(self, service: ApplicationService, events: List[Any]): def enqueue_ephemeral(self, service: ApplicationService, events: List[Any]):
@ -131,7 +131,7 @@ class _ServiceQueuer:
return return
run_as_background_process( run_as_background_process(
"as-sender-%s" % (service.id), self._send_request, service "as-sender-%s" % (service.id,), self._send_request, service
) )
async def _send_request(self, service: ApplicationService): async def _send_request(self, service: ApplicationService):

6
tests/appservice/test_scheduler.py
View File

@ -207,7 +207,9 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.TestCase):
def test_send_single_event_with_queue(self): def test_send_single_event_with_queue(self):
d = defer.Deferred() d = defer.Deferred()
self.txn_ctrl.send = Mock(side_effect=lambda x, y: make_deferred_yieldable(d)) self.txn_ctrl.send = Mock(
side_effect=lambda x, y, z: make_deferred_yieldable(d)
)
service = Mock(id=4) service = Mock(id=4)
event = Mock(event_id="first") event = Mock(event_id="first")
event2 = Mock(event_id="second") event2 = Mock(event_id="second")
@ -239,7 +241,7 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.TestCase):
send_return_list = [srv_1_defer, srv_2_defer] send_return_list = [srv_1_defer, srv_2_defer]
def do_send(x, y): def do_send(x, y, z):
return make_deferred_yieldable(send_return_list.pop(0)) return make_deferred_yieldable(send_return_list.pop(0))
self.txn_ctrl.send = Mock(side_effect=do_send) self.txn_ctrl.send = Mock(side_effect=do_send)