@@ -9,16 +9,15 @@ Upstream-Status: Pending [https://github.com/Kludex/uvicorn/discussions/2759]
Signed-off-by: Jan Vermaete <jan.vermaete@gmail.com>
---
- tests/protocols/test_websocket.py | 3 +++
- tests/supervisors/test_multiprocess.py | 2 ++
- tests/test_config.py | 5 +++--
+ tests/protocols/test_websocket.py | 3 +++
+ tests/supervisors/test_multiprocess.py | 2 ++
+ tests/test_config.py | 5 +++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/protocols/test_websocket.py b/tests/protocols/test_websocket.py
-index 2e1a33a..ae1e041 100644
--- a/tests/protocols/test_websocket.py
+++ b/tests/protocols/test_websocket.py
-@@ -685,6 +685,9 @@ MAX_WS_BYTES = 1024 * 1024 * 16
+@@ -694,6 +694,9 @@
MAX_WS_BYTES_PLUS1 = MAX_WS_BYTES + 1
@@ -29,30 +28,28 @@ index 2e1a33a..ae1e041 100644
"client_size_sent, server_size_max, expected_result",
[
diff --git a/tests/supervisors/test_multiprocess.py b/tests/supervisors/test_multiprocess.py
-index e1f594e..43002c3 100644
--- a/tests/supervisors/test_multiprocess.py
+++ b/tests/supervisors/test_multiprocess.py
-@@ -75,6 +75,7 @@ def test_multiprocess_run() -> None:
- supervisor.join_all()
+@@ -86,6 +86,7 @@
+ thread.join()
+@pytest.mark.skip(reason="fails on OpenEmbedded/Yocto")
@new_console_in_windows
def test_multiprocess_health_check() -> None:
"""
-@@ -121,6 +122,7 @@ def test_multiprocess_sigbreak() -> None: # pragma: py-not-win32
+@@ -151,6 +152,7 @@
supervisor.join_all()
+@pytest.mark.skip(reason="failing on Yocto/OpenEmbedded")
@pytest.mark.skipif(not hasattr(signal, "SIGHUP"), reason="platform unsupports SIGHUP")
- def test_multiprocess_sighup() -> None:
+ def test_multiprocess_sighup(monkeypatch: pytest.MonkeyPatch) -> None:
"""
diff --git a/tests/test_config.py b/tests/test_config.py
-index 9c80ca4..fe4c2e8 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
-@@ -303,8 +303,9 @@ def test_asgi_version(app: ASGIApplication, expected_interface: Literal["2.0", "
+@@ -309,8 +309,9 @@
@pytest.mark.parametrize(
"use_colors, expected",
[
@@ -64,6 +61,3 @@ index 9c80ca4..fe4c2e8 100644
pytest.param(True, True, id="use_colors_enabled"),
pytest.param(False, False, id="use_colors_disabled"),
],
-2.47.3
-
@@ -38,17 +38,16 @@ parametrized tests based on only some combinations failing.
Upstream-Status: Inappropriate (embedded specific)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- tests/protocols/test_websocket.py | 19 +++++++++++++++++++
+ tests/protocols/test_websocket.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/tests/protocols/test_websocket.py b/tests/protocols/test_websocket.py
-index 87a151d..85eb362 100644
--- a/tests/protocols/test_websocket.py
+++ b/tests/protocols/test_websocket.py
-@@ -204,6 +204,11 @@ async def test_close_connection(ws_protocol_cls: WSProtocol, http_protocol_cls:
+@@ -206,6 +206,11 @@
assert not is_open
-
-
+
+
+# FAIL: tests/protocols/test_websocket.py:test_headers[websockets-httptools]
+# FAIL: tests/protocols/test_websocket.py:test_headers[websockets-h11]
+# FAIL: tests/protocols/test_websocket.py:test_headers[websockets-sansio-httptools]
@@ -57,10 +56,10 @@ index 87a151d..85eb362 100644
async def test_headers(ws_protocol_cls: WSProtocol, http_protocol_cls: HTTPProtocol, unused_tcp_port: int):
class App(WebSocketResponse):
async def websocket_connect(self, message: WebSocketConnectEvent):
-@@ -758,6 +763,13 @@ async def test_send_binary_data_to_server_bigger_than_default_on_websockets(
- assert ws.close_code == expected_result
-
-
+@@ -762,6 +767,13 @@
+ assert disconnect_code == expected_result
+
+
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_exceeding_max_size[wsproto-httptools]
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_exceeding_max_size[wsproto-h11]
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_exceeding_max_size[websockets-httptools]
@@ -71,10 +70,10 @@ index 87a151d..85eb362 100644
async def test_fragmented_message_exceeding_max_size(
ws_protocol_cls: WSProtocol, http_protocol_cls: HTTPProtocol, unused_tcp_port: int
):
-@@ -782,6 +794,13 @@ async def test_fragmented_message_exceeding_max_size(
+@@ -784,6 +796,13 @@
assert exc_info.value.rcvd.code == 1009
-
-
+
+
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_reassembly[wsproto-httptools]
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_reassembly[wsproto-h11]
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_reassembly[websockets-httptools]
@@ -82,6 +81,6 @@ index 87a151d..85eb362 100644
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_reassembly[websockets-sansio-httptools]
+# FAIL: tests/protocols/test_websocket.py:test_fragmented_message_reassembly[websockets-sansio-h11]
+@pytest.mark.skip(reason="failing on Yocto/OpenEmbedded")
+ @pytest.mark.parametrize("opcode", [Opcode.TEXT, Opcode.BINARY])
async def test_fragmented_message_reassembly(
- ws_protocol_cls: WSProtocol, http_protocol_cls: HTTPProtocol, unused_tcp_port: int
- ):
+ ws_protocol_cls: WSProtocol, http_protocol_cls: HTTPProtocol, unused_tcp_port: int, opcode: Opcode
similarity index 88%
rename from meta-python/recipes-devtools/python/python3-uvicorn_0.49.0.bb
rename to meta-python/recipes-devtools/python/python3-uvicorn_0.54.0.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5c778842f66a649636561c423c0eec2e"
RECIPE_MAINTAINER = "Tom Geelen <t.f.g.geelen@gmail.com>"
-SRC_URI[sha256sum] = "ebf4271aa580d9de97f93192d4595176df6e91f9aae919ca73e4fc07df1e66a3"
+SRC_URI[sha256sum] = "a2e33cbfaa0306f8e6b0c13e0cb89d7d7a2da3e62b90c66e18c33d9807b28620"
SRC_URI += "file://0001-ptest-disable-failing-tests.patch \
file://0002-ptest-skip-test_headers.patch \
@@ -27,7 +27,7 @@ RDEPENDS:${PN} = "\
RDEPENDS:${PN}-ptest += "\
python3-a2wsgi \
- python3-httpx \
+ python3-httpx2 \
python3-pytest-mock \
python3-pyyaml \
"