From e372fb75b4bd5326c38c98db8ae51941955ae781 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sun, 3 Mar 2019 09:56:36 +0100 Subject: [PATCH] fix some classes for testing --- boswatch/network/server.py | 26 +++++++++++++++----------- test/test_header.py | 4 ---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/boswatch/network/server.py b/boswatch/network/server.py index c802ae8..f9cdfce 100644 --- a/boswatch/network/server.py +++ b/boswatch/network/server.py @@ -95,19 +95,23 @@ class TCPServer: @return True or False""" if not self.isRunning: - self._server = _ThreadedTCPServer(("", port), _ThreadedTCPRequestHandler) - self._server.timeout = self._timeout - self._server.alarmQueue = self._alarmQueue + try: + self._server = _ThreadedTCPServer(("", port), _ThreadedTCPRequestHandler) + self._server.timeout = self._timeout + self._server.alarmQueue = self._alarmQueue - self._server.clientsConnctedLock = self._clientsConnectedLock - self._server.clientsConnected = self._clientsConnected + self._server.clientsConnctedLock = self._clientsConnectedLock + self._server.clientsConnected = self._clientsConnected + + self._server_thread = threading.Thread(target=self._server.serve_forever) + self._server_thread.name = "Thread-BWServer" + self._server_thread.daemon = True + self._server_thread.start() + logging.debug("TCPServer started in Thread: %s", self._server_thread.name) + return True + except OSError: + logging.exception("Socket Error") - self._server_thread = threading.Thread(target=self._server.serve_forever) - self._server_thread.name = "Thread-BWServer" - self._server_thread.daemon = True - self._server_thread.start() - logging.debug("TCPServer started in Thread: %s", self._server_thread.name) - return True else: logging.warning("server always started") return True diff --git a/test/test_header.py b/test/test_header.py index 5ca4216..1732543 100644 --- a/test/test_header.py +++ b/test/test_header.py @@ -32,7 +32,3 @@ class Test_Header: def test_infoToLog(self): """!Test info to log""" assert header.infoToLog() - - def test_logoToScreen(self): - """!Test logo to screen""" - assert header.logoToScreen()