diff options
| author | Erik Johnston <erikj@jki.re> | 2017-11-08 11:54:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 11:54:10 +0000 |
| commit | d305987b40297fa282be200e6c9e040143a20ef8 (patch) | |
| tree | 881de23c90bd8b1c8fdfd0ccf6599c758e6dfccc /tests/handlers | |
| parent | Merge pull request #2637 from spantaleev/avoid-noop-media-deletes (diff) | |
| parent | Remove useless assignment in notify_interested_services (diff) | |
| download | synapse-d305987b40297fa282be200e6c9e040143a20ef8.tar.xz | |
Merge pull request #2631 from xyzz/fix_appservice_event_backlog
Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_appservice.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/handlers/test_appservice.py b/tests/handlers/test_appservice.py index 7fe88172c0..a667fb6f0e 100644 --- a/tests/handlers/test_appservice.py +++ b/tests/handlers/test_appservice.py @@ -53,7 +53,10 @@ class AppServiceHandlerTestCase(unittest.TestCase): type="m.room.message", room_id="!foo:bar" ) - self.mock_store.get_new_events_for_appservice.return_value = (0, [event]) + self.mock_store.get_new_events_for_appservice.side_effect = [ + (0, [event]), + (0, []) + ] self.mock_as_api.push = Mock() yield self.handler.notify_interested_services(0) self.mock_scheduler.submit_event_for_as.assert_called_once_with( @@ -75,7 +78,10 @@ class AppServiceHandlerTestCase(unittest.TestCase): ) self.mock_as_api.push = Mock() self.mock_as_api.query_user = Mock() - self.mock_store.get_new_events_for_appservice.return_value = (0, [event]) + self.mock_store.get_new_events_for_appservice.side_effect = [ + (0, [event]), + (0, []) + ] yield self.handler.notify_interested_services(0) self.mock_as_api.query_user.assert_called_once_with( services[0], user_id @@ -98,7 +104,10 @@ class AppServiceHandlerTestCase(unittest.TestCase): ) self.mock_as_api.push = Mock() self.mock_as_api.query_user = Mock() - self.mock_store.get_new_events_for_appservice.return_value = (0, [event]) + self.mock_store.get_new_events_for_appservice.side_effect = [ + (0, [event]), + (0, []) + ] yield self.handler.notify_interested_services(0) self.assertFalse( self.mock_as_api.query_user.called, |