diff --git a/test/util_chat_text_1.py b/test/util_chat_text_1.py index f4bb97e8..163f8128 100644 --- a/test/util_chat_text_1.py +++ b/test/util_chat_text_1.py @@ -60,7 +60,7 @@ def t_setup( tnc.time_list_high_bw = [3, 1, 1] tnc.time_list = [3, 1, 1] # Limit number of retries - tnc.rx_n_max_retries_per_burst = 10 + tnc.rx_n_max_retries_per_burst = 4 # Create the modem t_modem = modem.RF() diff --git a/test/util_chat_text_2.py b/test/util_chat_text_2.py index a53be4e6..363d7164 100644 --- a/test/util_chat_text_2.py +++ b/test/util_chat_text_2.py @@ -57,7 +57,7 @@ def t_setup( tnc.time_list_high_bw = [1, 1, 1] tnc.time_list = [1, 1, 1] # Limit number of retries - tnc.rx_n_max_retries_per_burst = 10 + tnc.rx_n_max_retries_per_burst = 4 # Create the modem t_modem = modem.RF() @@ -123,22 +123,22 @@ def t_highsnr_arq_short_station2( log.info("t_highsnr_arq_short_station2:", RXCHANNEL=modem.RXCHANNEL) log.info("t_highsnr_arq_short_station2:", TXCHANNEL=modem.TXCHANNEL) - # # This transaction should take less than 14 sec. - # 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 - # ): - # if time.time() > timeout: - # log.warning("station2 TIMEOUT", first=True) - # break - # time.sleep(0.5) - # log.info("station2, first", arq_state=pformat(static.ARQ_STATE)) + # This transaction should take less than 14 sec. + 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 + ): + if time.time() > timeout: + log.warning("station2 TIMEOUT", first=True) + break + time.sleep(0.5) + log.info("station2, first", arq_state=pformat(static.ARQ_STATE)) # Allow enough time for this side to receive the disconnect frame. - timeout = time.time() + 45 + timeout = time.time() + 20 while '"arq":"session","status":"close"' not in str(sock.SOCKET_QUEUE.queue): if time.time() > timeout: log.error("station2", TIMEOUT=True)