From 685575be77787a20894071d178e82db1cc89310d Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sun, 22 Oct 2023 12:28:32 +0200 Subject: [PATCH] ctest bug fix --- test/util_modem_IRS.py | 9 +++++---- test/util_modem_ISS.py | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/test/util_modem_IRS.py b/test/util_modem_IRS.py index 6df6dd41..cb865ebf 100644 --- a/test/util_modem_IRS.py +++ b/test/util_modem_IRS.py @@ -54,6 +54,7 @@ def irs_arq_cleanup(): def t_arq_irs(*args): # not sure why importing at top level isn't working import modem + import data_handler # pylint: disable=global-statement global IRS_original_arq_cleanup, MESSAGE @@ -80,12 +81,12 @@ def t_arq_irs(*args): Station.ssid_list = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] # start data handler - modem = data_handler.DATA() - modem.log = structlog.get_logger("util_modem_IRS_DATA") + data_handler = data_handler.DATA() + data_handler.log = structlog.get_logger("util_modem_IRS_DATA") # Inject a way to exit the TNC infinite loop - IRS_original_arq_cleanup = modem.arq_cleanup - modem.arq_cleanup = irs_arq_cleanup + IRS_original_arq_cleanup = data_handler.arq_cleanup + data_handler.arq_cleanup = irs_arq_cleanup # start modem t_modem = modem.RF() diff --git a/test/util_modem_ISS.py b/test/util_modem_ISS.py index def6b66a..1d06203f 100644 --- a/test/util_modem_ISS.py +++ b/test/util_modem_ISS.py @@ -56,7 +56,7 @@ def iss_arq_cleanup(): def t_arq_iss(*args): # not sure why importing at top level isn't working import modem - + import data_handler # pylint: disable=global-statement global ISS_original_arq_cleanup, MESSAGE @@ -90,12 +90,12 @@ def t_arq_iss(*args): bytes_out = b'{"dt":"f","fn":"zeit.txt","ft":"text\\/plain","d":"data:text\\/plain;base64,MyBtb2Rlcywgb2huZSBjbGFzcwowLjAwMDk2OTQ4MTE4MDk5MTg0MTcKCjIgbW9kZXMsIG9obmUgY2xhc3MKMC4wMDA5NjY1NDUxODkxMjI1Mzk0CgoxIG1vZGUsIG9obmUgY2xhc3MKMC4wMDA5NjY5NzY1NTU4Nzc4MjA5CgMyBtb2Rlcywgb2huZSBjbGFzcwowLjAwMDk2OTQ4MTE4MDk5MTg0MTcKCjIgbW9kZXMsIG9obmUgY2xhc3MKMC4wMDA5NjY1NDUxODkxMjI1Mzk0CgoxIG1vZGUsIG9obmUgY2xhc3MKMC4wMDA5NjY5NzY1NTU4Nzc4MjA5Cg=MyBtb2Rlcywgb2huZSBjbGFzcwowLjAwMDk2OTQ4MTE4MDk5MTg0MTcKCjIgbW9kZXMsIG9obmUgY2xhc3MKMC4wMDA5NjY1NDUxODkxMjI1Mzk0CgoxIG1vZGUsIG9obmUgY2xhc3MKMC4wMDA5NjY5NzY1NTU4Nzc4MjA5CgMyBtb2Rlcywgb2huZSBjbGFzcwowLjAwMDk2OTQ4MTE4MDk5MTg0MTcKCjIgbW9kZXMsIG9obmUgY2xhc3MKMC4wMDA5NjY1NDUxODkxMjI1Mzk0CgoxIG1vZGUsIG9obmUgY2xhc3MKMC4wMDA5NjY5NzY1NTU4Nzc4MjA5CgMyBtb2Rlcywgb2huZSBjbGFzcwowLjAwMDk2OTQ4MTE4MDk5MTg0MTcKCjIgbW9kZXMsIG9obmUgY2xhc3MKMC4wMDA5NjY1NDUxODkxMjI1Mzk0CgoxIG1vZGUsIG9obmUgY2xhc3MKMC4wMDA5NjY5NzY1NTU4Nzc4MjA5Cg=","crc":"123123123"}' # start data handler - modem = data_handler.DATA() - modem.log = structlog.get_logger("util_modem_ISS_DATA") + data_handler = data_handler.DATA() + data_handler.log = structlog.get_logger("util_modem_ISS_DATA") # Inject a way to exit the TNC infinite loop - ISS_original_arq_cleanup = modem.arq_cleanup - modem.arq_cleanup = iss_arq_cleanup + ISS_original_arq_cleanup = data_handler.arq_cleanup + data_handler.arq_cleanup = iss_arq_cleanup # start modem t_modem = modem.RF()