Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

squash

Browse Source
This commit is contained in:
Adam Hopkins 2020-07-14 10:30:48 +03:00
parent 3d1f100781
commit 27c8c12420
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sanic/testing.py
View File

@ -9,7 +9,6 @@ from sanic.exceptions import MethodNotSupported
from sanic.log import logger from sanic.log import logger
from sanic.response import text from sanic.response import text
ASGI_HOST = "mockserver" ASGI_HOST = "mockserver"
HOST = "127.0.0.1" HOST = "127.0.0.1"
PORT = None PORT = None
@ -95,9 +94,7 @@ class SanicTestClient:
@self.app.exception(MethodNotSupported) @self.app.exception(MethodNotSupported)
async def error_handler(request, exception): async def error_handler(request, exception):
if request.method in ["HEAD", "PATCH", "PUT", "DELETE"]: if request.method in ["HEAD", "PATCH", "PUT", "DELETE"]:
return text( return text("", exception.status_code, headers=exception.headers)
"", exception.status_code, headers=exception.headers
)
else: else:
return self.app.error_handler.default(request, exception) return self.app.error_handler.default(request, exception)
@ -113,9 +110,7 @@ class SanicTestClient:
host, port = sock.getsockname() host, port = sock.getsockname()
self.port = port self.port = port
if uri.startswith( if uri.startswith(("http:", "https:", "ftp:", "ftps://", "//", "ws:", "wss:")):
("http:", "https:", "ftp:", "ftps://", "//", "ws:", "wss:")
):
url = uri url = uri
else: else:
uri = uri if uri.startswith("/") else f"/{uri}" uri = uri if uri.startswith("/") else f"/{uri}"
@ -218,11 +213,11 @@ class SanicASGITestClient(httpx.AsyncClient):
self.last_request = request self.last_request = request
@app.listener("after_server_start") @app.listener("after_server_start")
def _start_test_mode(sanic, loop): def _start_test_mode(sanic, *args, **kwargs):
sanic.test_mode = True sanic.test_mode = True
@app.listener("before_server_end") @app.listener("before_server_end")
def _end_test_mode(sanic, loop): def _end_test_mode(sanic, *args, **kwargs):
sanic.test_mode = False sanic.test_mode = False
app.request_middleware.appendleft(_collect_request) app.request_middleware.appendleft(_collect_request)
@ -247,9 +242,7 @@ class SanicASGITestClient(httpx.AsyncClient):
headers.setdefault("sec-websocket-key", "testserver==") headers.setdefault("sec-websocket-key", "testserver==")
headers.setdefault("sec-websocket-version", "13") headers.setdefault("sec-websocket-version", "13")
if subprotocols is not None: if subprotocols is not None:
headers.setdefault( headers.setdefault("sec-websocket-protocol", ", ".join(subprotocols))
"sec-websocket-protocol", ", ".join(subprotocols)
)
scope = { scope = {
"type": "websocket", "type": "websocket",