From aaa2084bfdfcbf6312890fa4eef725d0b0c68c2c Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Tue, 19 Mar 2024 13:19:13 +0100 Subject: [PATCH] adjusted tests --- modem/p2p_connection.py | 1 + modem/state_manager.py | 1 + tests/test_p2p_connection.py | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modem/p2p_connection.py b/modem/p2p_connection.py index f4f8d992..9d4a626a 100644 --- a/modem/p2p_connection.py +++ b/modem/p2p_connection.py @@ -241,6 +241,7 @@ class P2PConnection: def received_data(self, frame): print(frame) self.p2p_data_rx_queue.put(frame['data']) + ack_data = self.frame_factory.build_p2p_connection_payload_ack(self.session_id, 0) self.launch_twr_irs(ack_data, self.ENTIRE_CONNECTION_TIMEOUT, mode=FREEDV_MODE.signalling) diff --git a/modem/state_manager.py b/modem/state_manager.py index 91bec80a..ca65e4fb 100644 --- a/modem/state_manager.py +++ b/modem/state_manager.py @@ -219,6 +219,7 @@ class StateManager: def register_p2p_connection_session(self, session): if session.session_id in self.p2p_connection_sessions: + print("session already registered...") return False self.p2p_connection_sessions[session.session_id] = session return True diff --git a/tests/test_p2p_connection.py b/tests/test_p2p_connection.py index 9f19d171..fdcfc3ee 100644 --- a/tests/test_p2p_connection.py +++ b/tests/test_p2p_connection.py @@ -160,15 +160,12 @@ class TestP2PConnectionSession(unittest.TestCase): for session_id in self.iss_state_manager.p2p_connection_sessions: session = self.iss_state_manager.get_p2p_connection_session(session_id) - + session.ENTIRE_CONNECTION_TIMEOUT = 15 # Generate and add 5 random entries to the queue for _ in range(5): random_entry = self.generate_random_string(2, 11) session.p2p_data_tx_queue.put(random_entry) - - - self.waitAndCloseChannels() @@ -185,6 +182,9 @@ class TestSocket: if b'CONNECTED AA1AAA-1 BB2BBB-2 0\r\n' in self.sent_data: self.test_class.connected_event.set() + if b'DISCONNECTED\r\n' in self.sent_data: + self.test_class.assertEqual(b'DISCONNECTED\r\n', b'DISCONNECTED\r\n') + if __name__ == '__main__': unittest.main()