little changes in server

This commit is contained in:
Bastian Schroll 2018-09-09 16:16:55 +02:00
parent b87d98fc7d
commit e97b97640b
2 changed files with 3 additions and 3 deletions

View file

@ -94,7 +94,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
self._server = socketserver.ThreadingTCPServer(("", port), TCPHandler)
self._server.timeout = self._timeout
self.flushData()
self.flushQueue()
self._server_thread = threading.Thread(target=self._server.serve_forever)
self._server_thread.name = "Thread-BWServer"
@ -160,7 +160,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
return len(_dataPackets) # no lock needed - only reading
@staticmethod
def flushData():
def flushQueue():
"""!To flush all existing data in queue"""
logging.debug("Flush data queue")
with _lockDataPackets:

View file

@ -147,7 +147,7 @@ class Test_ServerClient:
self.testClient2 = TCPClient()
assert self.testClient2.connect()
# send all
useServer.flushData()
useServer.flushQueue()
assert self.testClient1.transmit("test1")
time.sleep(0.1) # wait for recv to prevent fail of false order
assert self.testClient2.transmit("test2")