Remove commented code

This commit is contained in:
Paul Kronenwetter 2022-06-15 19:25:59 -04:00
parent 55b1f8c2cb
commit c08d84ad90
2 changed files with 4 additions and 15 deletions

View file

@ -140,10 +140,6 @@ def t_highsnr_arq_short_station1(
}
],
}
# Construct message to start beacon.
# data = {"type": "command", "command": "start_beacon", "parameter": "5"}
# Construct message to start cq.
# data = {"type": "command", "command": "cqcqcq"}
sock.process_tnc_commands(json.dumps(data, indent=None))
time.sleep(0.5)
@ -156,8 +152,6 @@ def t_highsnr_arq_short_station1(
while '"arq":"transmission","status":"transmitted"' not in str(
sock.SOCKET_QUEUE.queue
):
# while '"beacon":"transmitted"' not in str(sock.SOCKET_QUEUE.queue):
# while '"cq":"transmitting"' not in str(sock.SOCKET_QUEUE.queue):
if time.time() > timeout:
log.warning("station1 TIMEOUT", first=True)
break
@ -181,16 +175,14 @@ def t_highsnr_arq_short_station1(
# log.info("S1 DQT: ", DQ_Tx=pformat(tnc.data_queue_transmit.queue))
# log.info("S1 DQR: ", DQ_Rx=pformat(tnc.data_queue_received.queue))
# log.info("S1 Socket: ", socket_queue=pformat(sock.SOCKET_QUEUE.queue))
assert '"arq":"transmission","status":"transmitting"' in str(
sock.SOCKET_QUEUE.queue
)
assert '"arq":"transmission","status":"transmitted"' in str(sock.SOCKET_QUEUE.queue)
assert '"arq":"transmission","status":"failed"' not in str(sock.SOCKET_QUEUE.queue)
assert '"percent":100' in str(sock.SOCKET_QUEUE.queue)
# assert '"beacon":"transmitting"' in str(sock.SOCKET_QUEUE.queue)
# assert '"beacon":"failed"' not in str(sock.SOCKET_QUEUE.queue)
# assert '"cq":"transmitting"' in str(sock.SOCKET_QUEUE.queue)
# assert '"cq":"failed"' not in str(sock.SOCKET_QUEUE.queue)
assert '"command_response":"disconnect","status":"OK"' in str(
sock.SOCKET_QUEUE.queue
)

View file

@ -131,8 +131,6 @@ def t_highsnr_arq_short_station2(
'"arq":"transmission","status":"received"' not in str(sock.SOCKET_QUEUE.queue)
or static.ARQ_STATE
):
# while '"beacon":"received"' not in str(sock.SOCKET_QUEUE.queue):
# while '"cq":"received"' not in str(sock.SOCKET_QUEUE.queue):
if time.time() > timeout:
log.warning("station2 TIMEOUT", first=True)
break
@ -151,9 +149,8 @@ def t_highsnr_arq_short_station2(
# log.info("S2 DQT: ", DQ_Tx=pformat(tnc.data_queue_transmit.queue))
# log.info("S2 DQR: ", DQ_Rx=pformat(tnc.data_queue_received.queue))
# log.info("S2 Socket: ", socket_queue=pformat(sock.SOCKET_QUEUE.queue))
assert '"arq":"transmission","status":"received"' in str(sock.SOCKET_QUEUE.queue)
# assert '"beacon":"received"' in str(sock.SOCKET_QUEUE.queue)
# assert '"cq":"received"' in str(sock.SOCKET_QUEUE.queue)
# assert '"qrv":"transmitting"' in str(sock.SOCKET_QUEUE.queue)
assert '"arq":"session","status":"close"' in str(sock.SOCKET_QUEUE.queue)
log.error("station2: Exiting!")