From a11c377a31d00bc838fa06d507aa697d45284fd4 Mon Sep 17 00:00:00 2001 From: Paul Kronenwetter Date: Tue, 7 Jun 2022 21:33:42 -0400 Subject: [PATCH] Minor updates --- test/util_data_channel_1.py | 7 +++++-- test/util_data_channel_2.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/util_data_channel_1.py b/test/util_data_channel_1.py index 0c6060bb..3cd5b44e 100644 --- a/test/util_data_channel_1.py +++ b/test/util_data_channel_1.py @@ -139,7 +139,9 @@ 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":"transmitted"' 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 @@ -160,11 +162,12 @@ 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=sock.SOCKET_QUEUE.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 '"command_response":"disconnect","status":"OK"' in str( sock.SOCKET_QUEUE.queue diff --git a/test/util_data_channel_2.py b/test/util_data_channel_2.py index 19c7cea7..ef3933b0 100644 --- a/test/util_data_channel_2.py +++ b/test/util_data_channel_2.py @@ -130,7 +130,7 @@ def t_highsnr_arq_short_station2( # Allow enough time for this side to receive the disconnect frame. timeout = time.time() + 20 - while "ARQ;SESSION;CLOSE" not in static.INFO: + while '"arq":"session","status":"close"' not in str(sock.SOCKET_QUEUE.queue): if time.time() > timeout: log.error("station2", TIMEOUT=True) break @@ -139,7 +139,7 @@ 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=sock.SOCKET_QUEUE.queue) + # log.info("S2 Socket: ", socket_queue=pformat(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!")