From 43674989b9bb54fcd96b2e38d1fd04c3551d9f49 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Sun, 3 Mar 2019 20:08:31 +0100
Subject: [PATCH] little change in server test

---
 boswatch/network/server.py         | 5 ++---
 test/boswatch/test_ServerClient.py | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/boswatch/network/server.py b/boswatch/network/server.py
index b799afc..3001725 100644
--- a/boswatch/network/server.py
+++ b/boswatch/network/server.py
@@ -29,7 +29,7 @@ class _ThreadedTCPRequestHandler(socketserver.ThreadingMixIn, socketserver.BaseR
         """!Handles the request from an single client in a own thread
 
         Insert a request in the clients[] list and send a [ack]"""
-        with self.server.clientsConnctedLock:  # because our list is not threadsafe
+        with self.server.clientsConnectedLock:  # because our list is not threadsafe
             self.server.clientsConnected[threading.current_thread().name] = {"address": self.client_address[0], "timestamp": time.time()}
 
         logging.info("Client connected: %s", self.client_address[0])
@@ -100,7 +100,7 @@ class TCPServer:
                 self._server.timeout = self._timeout
                 self._server.alarmQueue = self._alarmQueue
 
-                self._server.clientsConnctedLock = self._clientsConnectedLock
+                self._server.clientsConnectedLock = self._clientsConnectedLock
                 self._server.clientsConnected = self._clientsConnected
 
                 self._server_thread = threading.Thread(target=self._server.serve_forever)
@@ -124,7 +124,6 @@ class TCPServer:
             self._server.shutdown()
             self._server_thread.join()
             self._server_thread = None
-            self._server.socket.close()
             self._server = None
             logging.debug("TCPServer stopped")
             return True
diff --git a/test/boswatch/test_ServerClient.py b/test/boswatch/test_ServerClient.py
index 1ba0531..f46182e 100644
--- a/test/boswatch/test_ServerClient.py
+++ b/test/boswatch/test_ServerClient.py
@@ -48,10 +48,12 @@ def getRunningServer(getServer):
     """!Build and serve a still running TCPServer"""
     logging.debug("start server")
     assert getServer.start()
-    assert getServer.isRunning
+    while not getServer.isRunning:
+        pass
     yield getServer
     logging.debug("stop server")
     assert getServer.stop()
+    time.sleep(0.1)  # wait for safe stopped
 
 
 def test_clientConnectFailed(getClient):