fix tests

aio-libs · Feb 20, 2017 · 8e7e286 · 8e7e286
1 parent 5440660
commit 8e7e286
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/sockjs/transports/base.py b/sockjs/transports/base.py
@@ -1,5 +1,5 @@
+import aiohttp
 import asyncio
-from aiohttp import errors
 
 from ..exceptions import SessionIsAcquired, SessionIsClosed
 from ..protocol import close_frame, ENCODING
@@ -78,7 +78,7 @@ def handle_session(self):
                                 break
                 except asyncio.CancelledError:
                     yield from self.session._remote_close(
-                        exc=errors.ClientDisconnectedError)
+                        exc=aiohttp.ClientConnectionError)
                     yield from self.session._remote_closed()
                     raise
                 except SessionIsClosed:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -14,6 +14,8 @@
 from sockjs import Session, SessionManager, transports
 from sockjs.route import SockJSRoute
 
+pytest_plugins = 'aiohttp.pytest_plugin'
+
 
 @pytest.fixture
 def app(loop):
@@ -82,7 +84,7 @@ def maker(method, path, query_params={}, headers=None,
                  'SEC-WEBSOCKET-PROTOCOL': 'chat, superchat',
                  'SEC-WEBSOCKET-VERSION': '13'})
 
-        ret = make_mocked_request(method, path, headers)
+        ret = make_mocked_request(method, str(path), headers)
         if match_info is None:
             match_info = UrlMappingMatchInfo({}, mock.Mock())
             match_info.add_app(app)

diff --git a/tests/test_route.py b/tests/test_route.py
@@ -1,7 +1,7 @@
 import asyncio
 
 from aiohttp import web
-from aiohttp import CIMultiDict
+from multidict import CIMultiDict
 
 from sockjs import protocol