From 6d80d1585939c07717ece0c539d4d894324de158 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sat, 16 Dec 2023 11:33:10 +0100 Subject: [PATCH] WIP ARQ - attempt fixing some tests --- tests/test_data_frame_factory.py | 4 ++-- tests/test_protocols.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/test_data_frame_factory.py b/tests/test_data_frame_factory.py index 16004275..6cb4a974 100755 --- a/tests/test_data_frame_factory.py +++ b/tests/test_data_frame_factory.py @@ -61,8 +61,8 @@ class TestDataFrameFactory(unittest.TestCase): FREEDV_MODE.datac3, session_id, offset, payload) def testAvailablePayload(self): - avail = self.factory.get_available_data_payload_for_mode(FRAME_TYPE.BURST_FRAME, FREEDV_MODE.datac3) - self.assertEqual(avail, 123) # 128 bytes datac3 frame payload - BURST frame overhead + avail = self.factory.get_available_data_payload_for_mode(FRAME_TYPE.ARQ_BURST_FRAME, FREEDV_MODE.datac3) + self.assertEqual(avail, 120) # 128 bytes datac3 frame payload - BURST frame overhead if __name__ == '__main__': unittest.main() diff --git a/tests/test_protocols.py b/tests/test_protocols.py index 1ef444f0..5e3a7308 100755 --- a/tests/test_protocols.py +++ b/tests/test_protocols.py @@ -9,6 +9,7 @@ import queue from state_manager import StateManager from command_ping import PingCommand from command_cq import CQCommand +import modem class TestProtocols(unittest.TestCase): @@ -22,14 +23,14 @@ class TestProtocols(unittest.TestCase): cls.event_queue = queue.Queue() - cls.data_queue_received = queue.Queue() cls.modem_transmit_queue = queue.Queue() + cls.modem = modem.RF(cls.config, cls.event_queue, queue.Queue(), queue.Queue(), cls.state_manager) cls.frame_dispatcher = DISPATCHER(cls.config, cls.event_queue, cls.state_manager, - cls.data_queue_received, - cls.modem_transmit_queue) + cls.modem) + def shortcutTransmission(self): transmission_item = self.modem_transmit_queue.get()