From 47a20a2727266ad781779b840d402b824380c430 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Thu, 9 Feb 2023 23:34:43 +0100 Subject: [PATCH] attempt fixing ctest with socket dummy --- test/util_datac0_negative.py | 10 +++++----- test/util_tnc_ISS.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/util_datac0_negative.py b/test/util_datac0_negative.py index d5aaf845..18a47aa4 100644 --- a/test/util_datac0_negative.py +++ b/test/util_datac0_negative.py @@ -148,8 +148,8 @@ def t_datac0_1( static.DXCALLSIGN_CRC = helpers.get_crc_24(static.DXCALLSIGN) static.TNC_STATE = "BUSY" static.ARQ_STATE = True - sock.process_tnc_commands(json.dumps(data, indent=None)) - sock.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) # Assure the test completes. timeout = time.time() + timeout_duration @@ -173,7 +173,7 @@ def t_datac0_1( # override ARQ SESSION STATE for allowing disconnect command static.ARQ_SESSION_STATE = "connected" data = {"type": "arq", "command": "disconnect", "dxcallsign": dxcall} - sock.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) time.sleep(0.5) # Allow enough time for this side to process the disconnect frame. @@ -266,8 +266,8 @@ def t_datac0_2( if "cq" in data: t_data = {"type": "arq", "command": "stop_transmission"} - sock.process_tnc_commands(json.dumps(t_data, indent=None)) - sock.process_tnc_commands(json.dumps(t_data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(t_data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(t_data, indent=None)) # Assure the test completes. timeout = time.time() + timeout_duration diff --git a/test/util_tnc_ISS.py b/test/util_tnc_ISS.py index f3d20a35..4bb741b0 100644 --- a/test/util_tnc_ISS.py +++ b/test/util_tnc_ISS.py @@ -124,17 +124,17 @@ def t_arq_iss(*args): time.sleep(0.5) - sock.process_tnc_commands(json.dumps(data, indent=None)) - sock.process_tnc_commands(json.dumps(data, indent=None)) - sock.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) time.sleep(1.5) data = {"type": "arq", "command": "stop_transmission"} - sock.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) time.sleep(0.5) - sock.process_tnc_commands(json.dumps(data, indent=None)) + sock.ThreadedTCPRequestHandler.process_tnc_commands(json.dumps(data, indent=None)) # Set timeout timeout = time.time() + 15