diff --git a/test/util_data_channel_1.py b/test/util_data_channel_1.py index db025214..0c6060bb 100644 --- a/test/util_data_channel_1.py +++ b/test/util_data_channel_1.py @@ -160,7 +160,7 @@ 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=sock.SOCKET_QUEUE.queue) assert '"arq":"transmission","status":"transmitting"' in str( sock.SOCKET_QUEUE.queue ) diff --git a/test/util_data_channel_2.py b/test/util_data_channel_2.py index a839dfd1..19c7cea7 100644 --- a/test/util_data_channel_2.py +++ b/test/util_data_channel_2.py @@ -16,8 +16,6 @@ import sock import static import structlog -FIRST_RX = True - def t_setup( mycall: str, @@ -120,7 +118,10 @@ 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":"transmission","status":"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 @@ -138,8 +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 Info: ", info=static.INFO) - log.info("S2 Socket: ", socket_queue=sock.SOCKET_QUEUE.queue) + # log.info("S2 Socket: ", socket_queue=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!")