From c08d84ad90fa9271aa9aa782f730008a177e44a7 Mon Sep 17 00:00:00 2001 From: Paul Kronenwetter Date: Wed, 15 Jun 2022 19:25:59 -0400 Subject: [PATCH] Remove commented code --- test/util_chat_text_1.py | 12 ++---------- test/util_chat_text_2.py | 7 ++----- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/test/util_chat_text_1.py b/test/util_chat_text_1.py index ac6546e6..34ab4885 100644 --- a/test/util_chat_text_1.py +++ b/test/util_chat_text_1.py @@ -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 ) diff --git a/test/util_chat_text_2.py b/test/util_chat_text_2.py index a018aa0e..a1883fb4 100644 --- a/test/util_chat_text_2.py +++ b/test/util_chat_text_2.py @@ -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!")