Fix shutdown when no client connected

Author: Pithikos

tests/test_server.py

@@ -41,17 +41,35 @@ def test_shutdown_gracefully(client_session):
     assert not server.clients
 
 
-class TestServerThreaded():
+class TestServerThreadedWithoutClient():
     def test_run_forever(self, threaded_server):
         assert threaded_server.thread
         assert not isinstance(threaded_server.thread, threading._MainThread)
         assert threaded_server.thread.is_alive()
 
     def test_shutdown(self, threaded_server):
         assert threaded_server.thread.is_alive()
+
+        # Shutdown de-facto way
+        # REF: https://docs.python.org/3/library/socketserver.html
+        #    "Tell the serve_forever() loop to stop and
+        #     wait until it does. shutdown() must be called while serve_forever()
+        #     is running in a different thread otherwise it will deadlock."
         threaded_server.shutdown()
         assert not threaded_server.thread.is_alive()
 
+    def test_shutdown_gracefully_without_clients(self, threaded_server):
+        assert threaded_server.thread.is_alive()
+        threaded_server.shutdown_gracefully()
+        assert not threaded_server.thread.is_alive()
+        assert threaded_server.socket.fileno() <= 0
+
+    def test_shutdown_abruptly_without_clients(self, threaded_server):
+        assert threaded_server.thread.is_alive()
+        threaded_server.shutdown_abruptly()
+        assert not threaded_server.thread.is_alive()
+        assert threaded_server.socket.fileno() <= 0
+
 
 def test_shutdown_abruptly(client_session):
     client, server = client_session

websocket_server/websocket_server.py

@@ -202,6 +202,7 @@ def _shutdown_gracefully(self, status=CLOSE_STATUS_NORMAL, reason=DEFAULT_CLOSE_
 
         self._terminate_client_handlers()
         self.server_close()
+        self.shutdown()
 
     def _shutdown_abruptly(self):
         """
@@ -210,6 +211,7 @@ def _shutdown_abruptly(self):
         self.keep_alive = False
         self._terminate_client_handlers()
         self.server_close()
+        self.shutdown()
 
 
 class WebSocketHandler(StreamRequestHandler):