From 5dd8dfb9ac3df05bf6ba846271b094ec70b12ef6 Mon Sep 17 00:00:00 2001 From: Mark Wolfman Date: Mon, 3 Nov 2025 15:23:41 -0600 Subject: [PATCH 1/2] Fixed the fragile test for merged signal names. --- tests/test_main_window.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_main_window.py b/tests/test_main_window.py index c3207ee..f9ea86d 100644 --- a/tests/test_main_window.py +++ b/tests/test_main_window.py @@ -391,7 +391,12 @@ async def test_merged_signal_options(window, mocker): window.ui.use_hints_checkbox.setChecked(False) window.ui.merge_streams_checkbox.setChecked(True) # Check that we got the right signals in the right order - await window.update_signal_widgets() + with block_signals( + window.ui.x_signal_combobox, + window.ui.v_signal_combobox, + window.ui.r_signal_combobox, + ): + await window.update_signal_widgets() expected_signals = [ "I0-net_count (I0)", "It-net_count", From 99eaa64425a0a161a4dacb47c2c13a627d879dc4 Mon Sep 17 00:00:00 2001 From: Mark Wolfman Date: Mon, 3 Nov 2025 15:30:13 -0600 Subject: [PATCH 2/2] --amend --- src/run_browser/main_window.py | 1 + tests/test_main_window.py | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/run_browser/main_window.py b/src/run_browser/main_window.py index 344f1d1..49737eb 100644 --- a/src/run_browser/main_window.py +++ b/src/run_browser/main_window.py @@ -328,6 +328,7 @@ async def update_signal_widgets(self): self.ui.r_signal_combobox, ] for combobox, new_signals in zip(comboboxes, [xsigs, vsigs, vsigs]): + print(f"{use_hints=}, {xsigs=}, {vsigs=}") self._set_combobox_signals(combobox, new_signals) def _set_combobox_signals(self, combobox: QComboBox, signals: Sequence[DataSignal]): diff --git a/tests/test_main_window.py b/tests/test_main_window.py index f9ea86d..c3207ee 100644 --- a/tests/test_main_window.py +++ b/tests/test_main_window.py @@ -391,12 +391,7 @@ async def test_merged_signal_options(window, mocker): window.ui.use_hints_checkbox.setChecked(False) window.ui.merge_streams_checkbox.setChecked(True) # Check that we got the right signals in the right order - with block_signals( - window.ui.x_signal_combobox, - window.ui.v_signal_combobox, - window.ui.r_signal_combobox, - ): - await window.update_signal_widgets() + await window.update_signal_widgets() expected_signals = [ "I0-net_count (I0)", "It-net_count",