diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-11-27 14:04:22 -0700 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-11-27 14:04:22 -0700 |
| commit | bc50cffa2698a484dffda0e1f64c832132b1ff48 (patch) | |
| tree | 401ed265c319a277506cb4ddfe9c12bbcb0d4716 /tests/push/test_http.py | |
| parent | More timeout (diff) | |
| parent | Support m.login.sso (#4220) (diff) | |
| download | synapse-bc50cffa2698a484dffda0e1f64c832132b1ff48.tar.xz | |
Merge branch 'develop' into travis/intentional-timeout github/travis/intentional-timeout travis/intentional-timeout
Diffstat (limited to 'tests/push/test_http.py')
| -rw-r--r-- | tests/push/test_http.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/push/test_http.py b/tests/push/test_http.py index addc01ab7f..6dc45e8506 100644 --- a/tests/push/test_http.py +++ b/tests/push/test_http.py @@ -18,6 +18,7 @@ from mock import Mock from twisted.internet.defer import Deferred from synapse.rest.client.v1 import admin, login, room +from synapse.util.logcontext import make_deferred_yieldable from tests.unittest import HomeserverTestCase @@ -47,7 +48,7 @@ class HTTPPusherTests(HomeserverTestCase): def post_json_get_json(url, body): d = Deferred() self.push_attempts.append((d, url, body)) - return d + return make_deferred_yieldable(d) m.post_json_get_json = post_json_get_json |