Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct status check.

Browse source
This commit is contained in:
Paul Kronenwetter 2022-06-06 18:18:52 -04:00
parent d258fa74b3
commit 1fcd7dbdec
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/util_data_channel_1.py
View file

@ -139,7 +139,7 @@ def t_highsnr_arq_short_station1(
timeout = time.time() + 25
# Compare with the string conversion instead of repeatedly dumping
# the queue to an object for comparisons.
while '"arq":"transmission","status":"received"' not in str(sock.SOCKET_QUEUE.queue):
while '"arq":"transmission","status":"transmitted"' not in str(sock.SOCKET_QUEUE.queue):
if time.time() > timeout:
log.warning("station1 TIMEOUT", first=True)
break
@ -164,7 +164,7 @@ def t_highsnr_arq_short_station1(
assert '"arq":"transmission","status":"transmitting"' in str(
sock.SOCKET_QUEUE.queue
)
assert '"arq":"transmission","status":"received"' in str(sock.SOCKET_QUEUE.queue)
assert '"arq":"transmission","status":"transmitted"' in str(sock.SOCKET_QUEUE.queue)
assert '"percent":100' in str(sock.SOCKET_QUEUE.queue)
assert '"command_response":"disconnect","status":"OK"' in str(
sock.SOCKET_QUEUE.queue

8
test/util_data_channel_2.py
View file

@ -120,7 +120,7 @@ def t_highsnr_arq_short_station2(
timeout = time.time() + 25
# Compare with the string conversion instead of repeatedly dumping
# the queue to an object for comparisons.
while '"arq":"received"' not in str(sock.SOCKET_QUEUE.queue) or static.ARQ_STATE:
while '"arq":"transmission","status":"received"' not in str(sock.SOCKET_QUEUE.queue) or static.ARQ_STATE:
if time.time() > timeout:
log.warning("station2 TIMEOUT", first=True)
break
@ -140,8 +140,6 @@ def t_highsnr_arq_short_station2(
# log.info("S2 DQR: ", DQ_Rx=pformat(tnc.data_queue_received.queue))
# log.info("S2 Info: ", info=static.INFO)
log.info("S2 Socket: ", socket_queue=sock.SOCKET_QUEUE.queue)
assert '"arq":"received"' in str(sock.SOCKET_QUEUE.queue)
# assert "DATACHANNEL;RECEIVEDOPENER" in static.INFO
assert "ARQ;SESSION;CLOSE" in static.INFO
# assert '"command_response":"disconnect","status":"OK"' in str(sock.SOCKET_QUEUE.queue)
assert '"arq":"transmission","status":"received"' in str(sock.SOCKET_QUEUE.queue)
assert '"arq":"session","status":"close"' in str(sock.SOCKET_QUEUE.queue)
log.error("station2: Exiting!")