Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/push/test_http.py b/tests/push/test_http.py

index 22c3f73ef3..8ce6bb62da 100644
--- a/tests/push/test_http.py
+++ b/tests/push/test_http.py
@@ -18,8 +18,8 @@ from mock import Mock
 from twisted.internet.defer import Deferred
 
 import synapse.rest.admin
+from synapse.logging.context import make_deferred_yieldable
 from synapse.rest.client.v1 import login, room
-from synapse.util.logcontext import make_deferred_yieldable
 
 from tests.unittest import HomeserverTestCase