chore(tests/asgi): adapt to Uvicorn now propagating signals to retcode

falconry · Mar 20, 2024 · ef68b8f · ef68b8f
1 parent 6141517
commit ef68b8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/requirements/tests b/requirements/tests
@@ -11,8 +11,7 @@ testtools; python_version < '3.10'
 pytest-asyncio < 0.22.0
 aiofiles
 httpx
-# TODO(vytas): Investigate: uvicorn 0.29.0 starts but then catches SIGTERM (?)
-uvicorn < 0.29.0
+uvicorn >= 0.17.0
 websockets
 
 # Handler Specific

diff --git a/tests/asgi/test_asgi_servers.py b/tests/asgi/test_asgi_servers.py
@@ -4,6 +4,7 @@
 import os
 import platform
 import random
+import signal
 import subprocess
 import sys
 import time
@@ -620,7 +621,10 @@ def server_base_url(request):
 
             yield base_url
 
-        assert server.returncode == 0
+        # NOTE(vytas): Starting with 0.29.0, Uvicorn will propagate signal
+        #   values into the return code (which is a good practice in Unix);
+        #   see also https://github.com/encode/uvicorn/pull/1600
+        assert server.returncode in (0, -signal.SIGTERM)
 
         break