BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix errors

Browse source
This commit is contained in:
Bastian Schroll 2019-10-23 09:19:32 +02:00
parent 096d6fefe3
commit 50095bf4a7
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
boswatch/network/client.py
View file

@ -105,7 +105,12 @@ class TCPClient:
@property
def isConnected(self):
"""!Property of client connected state"""
_, write, _ = select.select([], [self._sock], [], 0.1)
if write:
return True
return False
try:
if self._sock:
read, write, _ = select.select([], [self._sock], [], 0.1)
if read and write:
return True
return False
except:
logging.exception("cannot check connection status")
return False

4
test/boswatch/test_ServerClient.py
View file

@ -182,7 +182,7 @@ def test_serverStopsWhileConnected(getRunningServer, getClient):
"""!Shutdown server while client is connected"""
getClient.connect()
getRunningServer.stop()
timeout = 10
timeout = 5
while getClient.isConnected:
time.sleep(0.1)
timeout = timeout - 1
@ -221,7 +221,7 @@ def test_serverHighLoad(getRunningServer):
logging.debug("start sendThreads")
threads = []
for thr_id in range(10):
thr = threading.Thread(target=sendThread, name="sendThread-"+str(thr_id))
thr = threading.Thread(target=sendThread, name="sendThread-" + str(thr_id))
thr.daemon = True
thr.start()
threads.append(thr)