Skip to content

feat(pyamber): clean up reassigned channels #8228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carloea2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(pyamber): clean up reassigned channels #8228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions amber/src/main/python/core/architecture/packaging/input_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ def register_input(
port_id.id = 0
if port_id.internal is None:
port_id.internal = False
if channel_id in self._channels:
old_port_id = self._channels[channel_id].port_id
self._ports[old_port_id].get_channels().discard(channel_id)
channel = Channel()
channel.set_port_id(port_id)
self._channels[channel_id] = channel
Expand Down
7 changes: 2 additions & 5 deletions amber/src/test/python/core/architecture/packaging/test_input_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class TestChannelRegistration:
def manager(self):
return InputManager(worker_id=WORKER_ID, input_queue=MagicMock())

def test_re_registering_channel_leaves_stale_reverse_mapping(self, manager):
def test_re_registering_channel_moves_reverse_mapping(self, manager):
port_a, port_b = PortIdentity(0, False), PortIdentity(1, False)
channel_id = _channel("upstream")
for port_id in (port_a, port_b):
Expand All @@ -115,12 +115,9 @@ def test_re_registering_channel_leaves_stale_reverse_mapping(self, manager):
manager.register_input(channel_id, port_a)
manager.register_input(channel_id, port_b)

# The forward mapping is updated to the new port ...
assert manager.get_port_id(channel_id) == port_b
assert channel_id in manager.get_port(port_b).get_channels()
# ... but the old port's channel set is never cleaned up, so the
# channel remains in both reverse mappings (current behavior).
assert channel_id in manager.get_port(port_a).get_channels()
assert channel_id not in manager.get_port(port_a).get_channels()

def test_data_channel_ids_exclude_control_channels(self, manager):
port_id = PortIdentity(0, False)
Expand Down
Loading