From 74abeec08d0872406885ae197b871f6bae4cb616 Mon Sep 17 00:00:00 2001 From: Paul Kronenwetter Date: Sat, 11 Jun 2022 21:57:28 -0400 Subject: [PATCH] Decrease number of frame retries. Attempt to shorten the time failed tests take to end. --- test/util_chat_text_1.py | 2 ++ test/util_chat_text_2.py | 30 ++++++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/test/util_chat_text_1.py b/test/util_chat_text_1.py index 3cd5b44e..6f0a9ac8 100644 --- a/test/util_chat_text_1.py +++ b/test/util_chat_text_1.py @@ -57,6 +57,8 @@ def t_setup( tnc.time_list_low_bw = [3, 1, 1] 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 # Create the modem t_modem = modem.RF() diff --git a/test/util_chat_text_2.py b/test/util_chat_text_2.py index ef3933b0..3a8f575e 100644 --- a/test/util_chat_text_2.py +++ b/test/util_chat_text_2.py @@ -54,6 +54,8 @@ def t_setup( tnc.time_list_low_bw = [1, 1, 1] 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 # Create the modem t_modem = modem.RF() @@ -114,22 +116,22 @@ def t_highsnr_arq_short_station2( mycall, dxcall, lowbwmode, t_transmit, t_process_data ) - # 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() + 20 + timeout = time.time() + 45 while '"arq":"session","status":"close"' not in str(sock.SOCKET_QUEUE.queue): if time.time() > timeout: log.error("station2", TIMEOUT=True)