fix some classes for testing

This commit is contained in:
Bastian Schroll 2019-03-03 09:56:36 +01:00
parent f19bf7a96a
commit e372fb75b4
2 changed files with 15 additions and 15 deletions

View file

@ -95,19 +95,23 @@ class TCPServer:
@return True or False""" @return True or False"""
if not self.isRunning: if not self.isRunning:
self._server = _ThreadedTCPServer(("", port), _ThreadedTCPRequestHandler) try:
self._server.timeout = self._timeout self._server = _ThreadedTCPServer(("", port), _ThreadedTCPRequestHandler)
self._server.alarmQueue = self._alarmQueue self._server.timeout = self._timeout
self._server.alarmQueue = self._alarmQueue
self._server.clientsConnctedLock = self._clientsConnectedLock self._server.clientsConnctedLock = self._clientsConnectedLock
self._server.clientsConnected = self._clientsConnected 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: else:
logging.warning("server always started") logging.warning("server always started")
return True return True

View file

@ -32,7 +32,3 @@ class Test_Header:
def test_infoToLog(self): def test_infoToLog(self):
"""!Test info to log""" """!Test info to log"""
assert header.infoToLog() assert header.infoToLog()
def test_logoToScreen(self):
"""!Test logo to screen"""
assert header.logoToScreen()