From 1b324ae981cebedb1ae8dd5166ba57738b6b405d Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Sun, 28 Jun 2020 08:43:12 +0300
Subject: [PATCH] fix-#1856: adjust websockets version to setup.py and make
 nightly (py39) tests pass (#1857)

* fix-#1856: adjust websockets version to setup.py and make nightly (py39) tests pass

* fix-#1856: set min websockets version to 8.1

* fix-#1856: suppress timeout for CI to pass

* fix-#1856: timeout -> close_timeout due to deprecation warning

Co-authored-by: Adam Hopkins <admhpkns@gmail.com>
Co-authored-by: 7 <yunxu1992@gmail.com>
---
 sanic/websocket.py     | 2 +-
 setup.py               | 2 +-
 tests/test_reloader.py | 6 ++++--
 tox.ini                | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sanic/websocket.py b/sanic/websocket.py
index a2c7b81d..4ae83c85 100644
--- a/sanic/websocket.py
+++ b/sanic/websocket.py
@@ -113,7 +113,7 @@ class WebSocketProtocol(HttpProtocol):
 
         # hook up the websocket protocol
         self.websocket = WebSocketCommonProtocol(
-            timeout=self.websocket_timeout,
+            close_timeout=self.websocket_timeout,
             max_size=self.websocket_max_size,
             max_queue=self.websocket_max_queue,
             read_limit=self.websocket_read_limit,
diff --git a/setup.py b/setup.py
index 35d1228e..db788803 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@ requirements = [
     uvloop,
     ujson,
     "aiofiles>=0.3.0",
-    "websockets>=7.0,<9.0",
+    "websockets>=8.1,<9.0",
     "multidict>=4.0,<5.0",
     "httpx==0.11.1",
 ]
diff --git a/tests/test_reloader.py b/tests/test_reloader.py
index 5c6415b8..5eccb801 100644
--- a/tests/test_reloader.py
+++ b/tests/test_reloader.py
@@ -1,8 +1,9 @@
 import os
 import secrets
 import sys
+from contextlib import suppress
 
-from subprocess import PIPE, Popen
+from subprocess import PIPE, Popen, TimeoutExpired
 from tempfile import TemporaryDirectory
 from textwrap import dedent
 from threading import Timer
@@ -85,4 +86,5 @@ async def test_reloader_live(runargs, mode):
         finally:
             timeout.cancel()
             terminate(proc)
-            proc.wait(timeout=3)
+            with suppress(TimeoutExpired):
+                proc.wait(timeout=3)
diff --git a/tox.ini b/tox.ini
index 321e3a55..dc272c6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ deps =
     gunicorn
     pytest-benchmark
     uvicorn
-    websockets>=7.0,<8.0
+    websockets>=8.1,<9.0
 commands =
     pytest {posargs:tests --cov sanic}
     - coverage combine --append