Skip to content

Fix tests with resource names when InstrumentStudio 2025Q3 is installed #1225

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

Merged
dixonjoel merged 2 commits into from
Sep 10, 2025
Merged

Fix tests with resource names when InstrumentStudio 2025Q3 is installed #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5124c7d
Add alternate session names so the tests can pass with InstrumentStud…
dixonjoel Sep 9, 2025
dc98d70
Fix ni-python-styleguide linting errors
dixonjoel Sep 9, 2025
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
8 changes: 7 additions & 1 deletion packages/service/tests/acceptance/test_nidcpower_measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [
actual = _get_output(outputs)
expected1 = [
_MeasurementOutput("DCPower1/0", "DCPower1/0", "DCPower1/0", "DCPower1/0"),
_MeasurementOutput("DCPower1/2", "DCPower1/2", "DCPower1/2", "DCPower1/2"),
]
expected2 = [
_MeasurementOutput("niDCPower-DCPower1/0", "DCPower1/0", "DCPower1/0", "DCPower1/0"),
_MeasurementOutput("niDCPower-DCPower1/2", "DCPower1/2", "DCPower1/2", "DCPower1/2"),
]
assert actual == expected1 or actual == expected2


def _measure(
Expand Down
30 changes: 28 additions & 2 deletions packages/service/tests/acceptance/test_nidigital_measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,24 @@ def test___single_session___measure___creates_single_session(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [
actual = _get_output(outputs)
expected1 = [
_MeasurementOutput(
"DigitalPattern1",
"DigitalPattern1",
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
"site0/CS",
)
]
expected2 = [
_MeasurementOutput(
"niDigitalPattern-DigitalPattern1",
"DigitalPattern1",
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
"site0/CS",
)
]
assert actual == expected1 or actual == expected2


def test___multiple_sessions___measure___creates_multiple_sessions(
Expand All @@ -64,7 +74,8 @@ def test___multiple_sessions___measure___creates_multiple_sessions(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [
actual = _get_output(outputs)
expected1 = [
_MeasurementOutput(
"DigitalPattern1",
"DigitalPattern1",
Expand All @@ -78,6 +89,21 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
"site1/CS, site1/SCLK, site1/MOSI, site1/MISO",
),
]
expected2 = [
_MeasurementOutput(
"niDigitalPattern-DigitalPattern1",
"DigitalPattern1",
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
),
_MeasurementOutput(
"niDigitalPattern-DigitalPattern2",
"DigitalPattern2",
"site1/CS, site1/SCLK, site1/MOSI, site1/MISO",
"site1/CS, site1/SCLK, site1/MOSI, site1/MISO",
),
]
assert actual == expected1 or actual == expected2


def _measure(
Expand Down
8 changes: 7 additions & 1 deletion packages/service/tests/acceptance/test_nidmm_measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [
actual = _get_output(outputs)
expected1 = [
_MeasurementOutput("DMM1", "DMM1", "0", "0"),
_MeasurementOutput("DMM2", "DMM2", "0", "0"),
]
expected2 = [
_MeasurementOutput("niDMM-DMM1", "DMM1", "0", "0"),
_MeasurementOutput("niDMM-DMM2", "DMM2", "0", "0"),
]
assert actual == expected1 or actual == expected2


def _measure(
Expand Down
8 changes: 7 additions & 1 deletion packages/service/tests/acceptance/test_nifgen_measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [
actual = _get_output(outputs)
expected1 = [
_MeasurementOutput("FGEN1", "FGEN1", "0", "0"),
_MeasurementOutput("FGEN2", "FGEN2", "0", "0"),
]
expected2 = [
_MeasurementOutput("niFGen-FGEN1", "FGEN1", "0", "0"),
_MeasurementOutput("niFGen-FGEN2", "FGEN2", "0", "0"),
]
assert actual == expected1 or actual == expected2


def _measure(
Expand Down
8 changes: 7 additions & 1 deletion packages/service/tests/acceptance/test_niscope_measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [
actual = _get_output(outputs)
expected1 = [
_MeasurementOutput("SCOPE1", "SCOPE1", "0", "0"),
_MeasurementOutput("SCOPE2", "SCOPE2", "0", "0"),
]
expected2 = [
_MeasurementOutput("niScope-SCOPE1", "SCOPE1", "0", "0"),
_MeasurementOutput("niScope-SCOPE2", "SCOPE2", "0", "0"),
]
assert actual == expected1 or actual == expected2


def _measure(
Expand Down
14 changes: 11 additions & 3 deletions packages/service/tests/acceptance/test_niswitch_measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ def test___single_session___measure___creates_single_session(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [_MeasurementOutput("RelayDriver1", "RelayDriver1", "K0", "K0")]
actual = _get_output(outputs)
expected1 = [_MeasurementOutput("RelayDriver1", "RelayDriver1", "K0", "K0")]
expected2 = [_MeasurementOutput("niRelayDriver-RelayDriver1", "RelayDriver1", "K0", "K0")]
assert actual == expected1 or actual == expected2


def test___multiple_sessions___measure___creates_multiple_sessions(
Expand All @@ -44,11 +47,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
configurations = Configurations(relay_names=["SiteRelay1", "SiteRelay2"], multi_session=True)

outputs = _measure(stub_v2, pin_map_context, configurations)

assert _get_output(outputs) == [
actual = _get_output(outputs)
expected1 = [
_MeasurementOutput("RelayDriver1", "RelayDriver1", "K0", "K0"),
_MeasurementOutput("RelayDriver2", "RelayDriver2", "K1", "K1"),
]
expected2 = [
_MeasurementOutput("niRelayDriver-RelayDriver1", "RelayDriver1", "K0", "K0"),
_MeasurementOutput("niRelayDriver-RelayDriver2", "RelayDriver2", "K1", "K1"),
]
assert actual == expected1 or actual == expected2


def _measure(
Expand Down
30 changes: 29 additions & 1 deletion packages/service/tests/acceptance/test_session_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class Configuration(NamedTuple):
expected_session_names: Iterable[str]
expected_resource_names: Iterable[str]
expected_channel_lists: Iterable[str]
expected_session_names2: Iterable[str]


_FGEN_SINGLE_SESSION_CONFIGURATIONS = [
Expand All @@ -60,6 +61,7 @@ class Configuration(NamedTuple):
["FGEN1"],
["FGEN1"],
["0"],
expected_session_names2=["niFGen-FGEN1"],
),
Configuration(
"2Fgen2Pin2Site.pinmap",
Expand All @@ -68,6 +70,7 @@ class Configuration(NamedTuple):
["FGEN1"],
["FGEN1"],
["0"],
expected_session_names2=["niFGen-FGEN1"],
),
Configuration(
"2Fgen2Pin2Site.pinmap",
Expand All @@ -76,6 +79,7 @@ class Configuration(NamedTuple):
["FGEN1"],
["FGEN1"],
["0, 1"],
expected_session_names2=["niFGen-FGEN1"],
),
Configuration(
"2Fgen2Pin2Site.pinmap",
Expand All @@ -84,6 +88,7 @@ class Configuration(NamedTuple):
["FGEN2"],
["FGEN2"],
["0, 1"],
expected_session_names2=["niFGen-FGEN2"],
),
]

Expand All @@ -95,6 +100,7 @@ class Configuration(NamedTuple):
["FGEN1", "FGEN2"],
["FGEN1", "FGEN2"],
["0, 1", "0, 1"],
expected_session_names2=["niFGen-FGEN1", "niFGen-FGEN2"],
),
]

Expand All @@ -106,6 +112,7 @@ class Configuration(NamedTuple):
["DCPower1/0"],
["DCPower1/0"],
["DCPower1/0"],
expected_session_names2=["niDCPower-DCPower1/0"],
),
Configuration(
"1Smu1ChannelGroup2Pin2Site.pinmap",
Expand All @@ -114,6 +121,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
),
Configuration(
"1Smu1ChannelGroup2Pin2Site.pinmap",
Expand All @@ -122,6 +130,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
),
Configuration(
"1Smu1ChannelGroup2Pin2Site.pinmap",
Expand All @@ -130,6 +139,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/2"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
),
Configuration(
"1Smu1ChannelGroup2Pin2Site.pinmap",
Expand All @@ -138,6 +148,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
),
Configuration(
"1Smu2ChannelGroup2Pin2Site.pinmap",
Expand All @@ -146,6 +157,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1"],
["DCPower1/0, DCPower1/1"],
["DCPower1/0"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
),
Configuration(
"1Smu2ChannelGroup2Pin2Site.pinmap",
Expand All @@ -154,6 +166,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1"],
["DCPower1/0, DCPower1/1"],
["DCPower1/0, DCPower1/1"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
),
Configuration(
"1Smu2ChannelGroup2Pin2Site.pinmap",
Expand All @@ -162,6 +175,7 @@ class Configuration(NamedTuple):
["DCPower1/2, DCPower1/3"],
["DCPower1/2, DCPower1/3"],
["DCPower1/2, DCPower1/3"],
expected_session_names2=["niDCPower-DCPower1/2, DCPower1/3"],
),
Configuration(
"2Smu2ChannelGroup2Pin2Site.pinmap",
Expand All @@ -170,6 +184,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1"],
["DCPower1/0, DCPower1/1"],
["DCPower1/0"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
),
Configuration(
"2Smu2ChannelGroup2Pin2Site.pinmap",
Expand All @@ -178,6 +193,7 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1"],
["DCPower1/0, DCPower1/1"],
["DCPower1/0, DCPower1/1"],
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
),
Configuration(
"2Smu2ChannelGroup2Pin2Site.pinmap",
Expand All @@ -186,6 +202,7 @@ class Configuration(NamedTuple):
["DCPower2/0, DCPower2/1"],
["DCPower2/0, DCPower2/1"],
["DCPower2/0, DCPower2/1"],
expected_session_names2=["niDCPower-DCPower2/0, DCPower2/1"],
),
]

Expand All @@ -197,6 +214,10 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1", "DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1", "DCPower1/2, DCPower1/3"],
["DCPower1/0, DCPower1/1", "DCPower1/2, DCPower1/3"],
expected_session_names2=[
"niDCPower-DCPower1/0, DCPower1/1",
"niDCPower-DCPower1/2, DCPower1/3",
],
),
Configuration(
"2Smu2ChannelGroup2Pin2Site.pinmap",
Expand All @@ -205,6 +226,10 @@ class Configuration(NamedTuple):
["DCPower1/0, DCPower1/1", "DCPower2/0, DCPower2/1"],
["DCPower1/0, DCPower1/1", "DCPower2/0, DCPower2/1"],
["DCPower1/0, DCPower1/1", "DCPower2/0, DCPower2/1"],
expected_session_names2=[
"niDCPower-DCPower1/0, DCPower1/1",
"niDCPower-DCPower2/0, DCPower2/1",
],
),
]

Expand Down Expand Up @@ -248,7 +273,10 @@ def test___multi_session___measure___reserves_multiple_sessions(

outputs = _measure(stub_v2, pin_map_context, configurations)

assert outputs.session_names == configuration.expected_session_names
assert (
outputs.session_names == configuration.expected_session_names
or outputs.session_names == configuration.expected_session_names2
)
assert outputs.resource_names == configuration.expected_resource_names
assert outputs.channel_lists == configuration.expected_channel_lists

Expand Down
19 changes: 15 additions & 4 deletions packages/service/tests/integration/session_management/test_nidcpower_reservation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ def test___single_session_reserved___initialize_nidcpower_session___creates_sing
session_info = stack.enter_context(reservation.initialize_nidcpower_session())

assert session_info.session is not None
assert session_info.session_name == "DCPower1/0"
assert (
session_info.session_name == "DCPower1/0"
or session_info.session_name == "niDCPower-DCPower1/0"
)


def test___multiple_sessions_reserved___initialize_nidcpower_sessions___creates_multiple_sessions(
pin_map_context: PinMapContext,
session_management_client: SessionManagementClient,
) -> None:
pin_names = ["Pin1", "Pin2"]
nidcpower_resource = ["DCPower1/0", "DCPower1/2"]
nidcpower_resources = ["DCPower1/0", "DCPower1/2"]
nidcpower_resources2 = ["niDCPower-DCPower1/0", "niDCPower-DCPower1/2"]
with ExitStack() as stack:
reservation = stack.enter_context(
session_management_client.reserve_sessions(pin_map_context, pin_names)
Expand All @@ -43,12 +47,19 @@ def test___multiple_sessions_reserved___initialize_nidcpower_sessions___creates_
session_infos = stack.enter_context(reservation.initialize_nidcpower_sessions())

assert all([session_info.session is not None for session_info in session_infos])
assert all(
matches1 = all(
[
session_info.session_name == expected_resource
for session_info, expected_resource in zip(session_infos, nidcpower_resources)
]
)
matches2 = all(
[
session_info.session_name == expected_resource
for session_info, expected_resource in zip(session_infos, nidcpower_resource)
for session_info, expected_resource in zip(session_infos, nidcpower_resources2)
]
)
assert matches1 or matches2


def test___session_created___get_nidcpower_connection___returns_connection(
Expand Down
5 changes: 4 additions & 1 deletion packages/service/tests/integration/session_management/test_nidigital_reservation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ def test___single_session_reserved___initialize_nidigital_session___creates_sing
session_info = stack.enter_context(reservation.initialize_nidigital_session())

assert session_info.session is not None
assert session_info.session_name == "DigitalPattern1"
assert (
session_info.session_name == "DigitalPattern1"
or session_info.session_name == "niDigitalPattern-DigitalPattern1"
)


def test___multiple_sessions_reserved___initialize_nidigital_sessions___creates_multiple_sessions(
Expand Down
Loading
Loading