Skip to content

Commit c1954e4

Browse files
dixonjoeldixonjoel
authored
Fix tests with resource names when InstrumentStudio 2025Q3 is installed (#1225)
* Add alternate session names so the tests can pass with InstrumentStudio 2025Q3 or greater as well as older versions * Fix ni-python-styleguide linting errors
1 parent 5bb5a99 commit c1954e4

13 files changed

+149
-24
lines changed

‎packages/service/tests/acceptance/test_nidcpower_measurement.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
5959

6060
outputs = _measure(stub_v2, pin_map_context, configurations)
6161

62-
assert _get_output(outputs) == [
62+
actual = _get_output(outputs)
63+
expected1 = [
6364
_MeasurementOutput("DCPower1/0", "DCPower1/0", "DCPower1/0", "DCPower1/0"),
6465
_MeasurementOutput("DCPower1/2", "DCPower1/2", "DCPower1/2", "DCPower1/2"),
6566
]
67+
expected2 = [
68+
_MeasurementOutput("niDCPower-DCPower1/0", "DCPower1/0", "DCPower1/0", "DCPower1/0"),
69+
_MeasurementOutput("niDCPower-DCPower1/2", "DCPower1/2", "DCPower1/2", "DCPower1/2"),
70+
]
71+
assert actual == expected1 or actual == expected2
6672

6773

6874
def _measure(

‎packages/service/tests/acceptance/test_nidigital_measurement.py‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,24 @@ def test___single_session___measure___creates_single_session(
4545

4646
outputs = _measure(stub_v2, pin_map_context, configurations)
4747

48-
assert _get_output(outputs) == [
48+
actual = _get_output(outputs)
49+
expected1 = [
4950
_MeasurementOutput(
5051
"DigitalPattern1",
5152
"DigitalPattern1",
5253
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
5354
"site0/CS",
5455
)
5556
]
57+
expected2 = [
58+
_MeasurementOutput(
59+
"niDigitalPattern-DigitalPattern1",
60+
"DigitalPattern1",
61+
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
62+
"site0/CS",
63+
)
64+
]
65+
assert actual == expected1 or actual == expected2
5666

5767

5868
def test___multiple_sessions___measure___creates_multiple_sessions(
@@ -64,7 +74,8 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
6474

6575
outputs = _measure(stub_v2, pin_map_context, configurations)
6676

67-
assert _get_output(outputs) == [
77+
actual = _get_output(outputs)
78+
expected1 = [
6879
_MeasurementOutput(
6980
"DigitalPattern1",
7081
"DigitalPattern1",
@@ -78,6 +89,21 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
7889
"site1/CS, site1/SCLK, site1/MOSI, site1/MISO",
7990
),
8091
]
92+
expected2 = [
93+
_MeasurementOutput(
94+
"niDigitalPattern-DigitalPattern1",
95+
"DigitalPattern1",
96+
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
97+
"site0/CS, site0/SCLK, site0/MOSI, site0/MISO",
98+
),
99+
_MeasurementOutput(
100+
"niDigitalPattern-DigitalPattern2",
101+
"DigitalPattern2",
102+
"site1/CS, site1/SCLK, site1/MOSI, site1/MISO",
103+
"site1/CS, site1/SCLK, site1/MOSI, site1/MISO",
104+
),
105+
]
106+
assert actual == expected1 or actual == expected2
81107

82108

83109
def _measure(

‎packages/service/tests/acceptance/test_nidmm_measurement.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
6060

6161
outputs = _measure(stub_v2, pin_map_context, configurations)
6262

63-
assert _get_output(outputs) == [
63+
actual = _get_output(outputs)
64+
expected1 = [
6465
_MeasurementOutput("DMM1", "DMM1", "0", "0"),
6566
_MeasurementOutput("DMM2", "DMM2", "0", "0"),
6667
]
68+
expected2 = [
69+
_MeasurementOutput("niDMM-DMM1", "DMM1", "0", "0"),
70+
_MeasurementOutput("niDMM-DMM2", "DMM2", "0", "0"),
71+
]
72+
assert actual == expected1 or actual == expected2
6773

6874

6975
def _measure(

‎packages/service/tests/acceptance/test_nifgen_measurement.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
4545

4646
outputs = _measure(stub_v2, pin_map_context, configurations)
4747

48-
assert _get_output(outputs) == [
48+
actual = _get_output(outputs)
49+
expected1 = [
4950
_MeasurementOutput("FGEN1", "FGEN1", "0", "0"),
5051
_MeasurementOutput("FGEN2", "FGEN2", "0", "0"),
5152
]
53+
expected2 = [
54+
_MeasurementOutput("niFGen-FGEN1", "FGEN1", "0", "0"),
55+
_MeasurementOutput("niFGen-FGEN2", "FGEN2", "0", "0"),
56+
]
57+
assert actual == expected1 or actual == expected2
5258

5359

5460
def _measure(

‎packages/service/tests/acceptance/test_niscope_measurement.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,16 @@ def test___multiple_sessions___measure___creates_multiple_sessions(
5656

5757
outputs = _measure(stub_v2, pin_map_context, configurations)
5858

59-
assert _get_output(outputs) == [
59+
actual = _get_output(outputs)
60+
expected1 = [
6061
_MeasurementOutput("SCOPE1", "SCOPE1", "0", "0"),
6162
_MeasurementOutput("SCOPE2", "SCOPE2", "0", "0"),
6263
]
64+
expected2 = [
65+
_MeasurementOutput("niScope-SCOPE1", "SCOPE1", "0", "0"),
66+
_MeasurementOutput("niScope-SCOPE2", "SCOPE2", "0", "0"),
67+
]
68+
assert actual == expected1 or actual == expected2
6369

6470

6571
def _measure(

‎packages/service/tests/acceptance/test_niswitch_measurement.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ def test___single_session___measure___creates_single_session(
3434

3535
outputs = _measure(stub_v2, pin_map_context, configurations)
3636

37-
assert _get_output(outputs) == [_MeasurementOutput("RelayDriver1", "RelayDriver1", "K0", "K0")]
37+
actual = _get_output(outputs)
38+
expected1 = [_MeasurementOutput("RelayDriver1", "RelayDriver1", "K0", "K0")]
39+
expected2 = [_MeasurementOutput("niRelayDriver-RelayDriver1", "RelayDriver1", "K0", "K0")]
40+
assert actual == expected1 or actual == expected2
3841

3942

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

4649
outputs = _measure(stub_v2, pin_map_context, configurations)
47-
48-
assert _get_output(outputs) == [
50+
actual = _get_output(outputs)
51+
expected1 = [
4952
_MeasurementOutput("RelayDriver1", "RelayDriver1", "K0", "K0"),
5053
_MeasurementOutput("RelayDriver2", "RelayDriver2", "K1", "K1"),
5154
]
55+
expected2 = [
56+
_MeasurementOutput("niRelayDriver-RelayDriver1", "RelayDriver1", "K0", "K0"),
57+
_MeasurementOutput("niRelayDriver-RelayDriver2", "RelayDriver2", "K1", "K1"),
58+
]
59+
assert actual == expected1 or actual == expected2
5260

5361

5462
def _measure(

‎packages/service/tests/acceptance/test_session_management.py‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class Configuration(NamedTuple):
5050
expected_session_names: Iterable[str]
5151
expected_resource_names: Iterable[str]
5252
expected_channel_lists: Iterable[str]
53+
expected_session_names2: Iterable[str]
5354

5455

5556
_FGEN_SINGLE_SESSION_CONFIGURATIONS = [
@@ -60,6 +61,7 @@ class Configuration(NamedTuple):
6061
["FGEN1"],
6162
["FGEN1"],
6263
["0"],
64+
expected_session_names2=["niFGen-FGEN1"],
6365
),
6466
Configuration(
6567
"2Fgen2Pin2Site.pinmap",
@@ -68,6 +70,7 @@ class Configuration(NamedTuple):
6870
["FGEN1"],
6971
["FGEN1"],
7072
["0"],
73+
expected_session_names2=["niFGen-FGEN1"],
7174
),
7275
Configuration(
7376
"2Fgen2Pin2Site.pinmap",
@@ -76,6 +79,7 @@ class Configuration(NamedTuple):
7679
["FGEN1"],
7780
["FGEN1"],
7881
["0, 1"],
82+
expected_session_names2=["niFGen-FGEN1"],
7983
),
8084
Configuration(
8185
"2Fgen2Pin2Site.pinmap",
@@ -84,6 +88,7 @@ class Configuration(NamedTuple):
8488
["FGEN2"],
8589
["FGEN2"],
8690
["0, 1"],
91+
expected_session_names2=["niFGen-FGEN2"],
8792
),
8893
]
8994

@@ -95,6 +100,7 @@ class Configuration(NamedTuple):
95100
["FGEN1", "FGEN2"],
96101
["FGEN1", "FGEN2"],
97102
["0, 1", "0, 1"],
103+
expected_session_names2=["niFGen-FGEN1", "niFGen-FGEN2"],
98104
),
99105
]
100106

@@ -106,6 +112,7 @@ class Configuration(NamedTuple):
106112
["DCPower1/0"],
107113
["DCPower1/0"],
108114
["DCPower1/0"],
115+
expected_session_names2=["niDCPower-DCPower1/0"],
109116
),
110117
Configuration(
111118
"1Smu1ChannelGroup2Pin2Site.pinmap",
@@ -114,6 +121,7 @@ class Configuration(NamedTuple):
114121
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
115122
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
116123
["DCPower1/0"],
124+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
117125
),
118126
Configuration(
119127
"1Smu1ChannelGroup2Pin2Site.pinmap",
@@ -122,6 +130,7 @@ class Configuration(NamedTuple):
122130
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
123131
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
124132
["DCPower1/0, DCPower1/1"],
133+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
125134
),
126135
Configuration(
127136
"1Smu1ChannelGroup2Pin2Site.pinmap",
@@ -130,6 +139,7 @@ class Configuration(NamedTuple):
130139
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
131140
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
132141
["DCPower1/0, DCPower1/2"],
142+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
133143
),
134144
Configuration(
135145
"1Smu1ChannelGroup2Pin2Site.pinmap",
@@ -138,6 +148,7 @@ class Configuration(NamedTuple):
138148
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
139149
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
140150
["DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
151+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1, DCPower1/2, DCPower1/3"],
141152
),
142153
Configuration(
143154
"1Smu2ChannelGroup2Pin2Site.pinmap",
@@ -146,6 +157,7 @@ class Configuration(NamedTuple):
146157
["DCPower1/0, DCPower1/1"],
147158
["DCPower1/0, DCPower1/1"],
148159
["DCPower1/0"],
160+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
149161
),
150162
Configuration(
151163
"1Smu2ChannelGroup2Pin2Site.pinmap",
@@ -154,6 +166,7 @@ class Configuration(NamedTuple):
154166
["DCPower1/0, DCPower1/1"],
155167
["DCPower1/0, DCPower1/1"],
156168
["DCPower1/0, DCPower1/1"],
169+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
157170
),
158171
Configuration(
159172
"1Smu2ChannelGroup2Pin2Site.pinmap",
@@ -162,6 +175,7 @@ class Configuration(NamedTuple):
162175
["DCPower1/2, DCPower1/3"],
163176
["DCPower1/2, DCPower1/3"],
164177
["DCPower1/2, DCPower1/3"],
178+
expected_session_names2=["niDCPower-DCPower1/2, DCPower1/3"],
165179
),
166180
Configuration(
167181
"2Smu2ChannelGroup2Pin2Site.pinmap",
@@ -170,6 +184,7 @@ class Configuration(NamedTuple):
170184
["DCPower1/0, DCPower1/1"],
171185
["DCPower1/0, DCPower1/1"],
172186
["DCPower1/0"],
187+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
173188
),
174189
Configuration(
175190
"2Smu2ChannelGroup2Pin2Site.pinmap",
@@ -178,6 +193,7 @@ class Configuration(NamedTuple):
178193
["DCPower1/0, DCPower1/1"],
179194
["DCPower1/0, DCPower1/1"],
180195
["DCPower1/0, DCPower1/1"],
196+
expected_session_names2=["niDCPower-DCPower1/0, DCPower1/1"],
181197
),
182198
Configuration(
183199
"2Smu2ChannelGroup2Pin2Site.pinmap",
@@ -186,6 +202,7 @@ class Configuration(NamedTuple):
186202
["DCPower2/0, DCPower2/1"],
187203
["DCPower2/0, DCPower2/1"],
188204
["DCPower2/0, DCPower2/1"],
205+
expected_session_names2=["niDCPower-DCPower2/0, DCPower2/1"],
189206
),
190207
]
191208

@@ -197,6 +214,10 @@ class Configuration(NamedTuple):
197214
["DCPower1/0, DCPower1/1", "DCPower1/2, DCPower1/3"],
198215
["DCPower1/0, DCPower1/1", "DCPower1/2, DCPower1/3"],
199216
["DCPower1/0, DCPower1/1", "DCPower1/2, DCPower1/3"],
217+
expected_session_names2=[
218+
"niDCPower-DCPower1/0, DCPower1/1",
219+
"niDCPower-DCPower1/2, DCPower1/3",
220+
],
200221
),
201222
Configuration(
202223
"2Smu2ChannelGroup2Pin2Site.pinmap",
@@ -205,6 +226,10 @@ class Configuration(NamedTuple):
205226
["DCPower1/0, DCPower1/1", "DCPower2/0, DCPower2/1"],
206227
["DCPower1/0, DCPower1/1", "DCPower2/0, DCPower2/1"],
207228
["DCPower1/0, DCPower1/1", "DCPower2/0, DCPower2/1"],
229+
expected_session_names2=[
230+
"niDCPower-DCPower1/0, DCPower1/1",
231+
"niDCPower-DCPower2/0, DCPower2/1",
232+
],
208233
),
209234
]
210235

@@ -248,7 +273,10 @@ def test___multi_session___measure___reserves_multiple_sessions(
248273

249274
outputs = _measure(stub_v2, pin_map_context, configurations)
250275

251-
assert outputs.session_names == configuration.expected_session_names
276+
assert (
277+
outputs.session_names == configuration.expected_session_names
278+
or outputs.session_names == configuration.expected_session_names2
279+
)
252280
assert outputs.resource_names == configuration.expected_resource_names
253281
assert outputs.channel_lists == configuration.expected_channel_lists
254282

‎packages/service/tests/integration/session_management/test_nidcpower_reservation.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,19 @@ def test___single_session_reserved___initialize_nidcpower_session___creates_sing
2626
session_info = stack.enter_context(reservation.initialize_nidcpower_session())
2727

2828
assert session_info.session is not None
29-
assert session_info.session_name == "DCPower1/0"
29+
assert (
30+
session_info.session_name == "DCPower1/0"
31+
or session_info.session_name == "niDCPower-DCPower1/0"
32+
)
3033

3134

3235
def test___multiple_sessions_reserved___initialize_nidcpower_sessions___creates_multiple_sessions(
3336
pin_map_context: PinMapContext,
3437
session_management_client: SessionManagementClient,
3538
) -> None:
3639
pin_names = ["Pin1", "Pin2"]
37-
nidcpower_resource = ["DCPower1/0", "DCPower1/2"]
40+
nidcpower_resources = ["DCPower1/0", "DCPower1/2"]
41+
nidcpower_resources2 = ["niDCPower-DCPower1/0", "niDCPower-DCPower1/2"]
3842
with ExitStack() as stack:
3943
reservation = stack.enter_context(
4044
session_management_client.reserve_sessions(pin_map_context, pin_names)
@@ -43,12 +47,19 @@ def test___multiple_sessions_reserved___initialize_nidcpower_sessions___creates_
4347
session_infos = stack.enter_context(reservation.initialize_nidcpower_sessions())
4448

4549
assert all([session_info.session is not None for session_info in session_infos])
46-
assert all(
50+
matches1 = all(
51+
[
52+
session_info.session_name == expected_resource
53+
for session_info, expected_resource in zip(session_infos, nidcpower_resources)
54+
]
55+
)
56+
matches2 = all(
4757
[
4858
session_info.session_name == expected_resource
49-
for session_info, expected_resource in zip(session_infos, nidcpower_resource)
59+
for session_info, expected_resource in zip(session_infos, nidcpower_resources2)
5060
]
5161
)
62+
assert matches1 or matches2
5263

5364

5465
def test___session_created___get_nidcpower_connection___returns_connection(

‎packages/service/tests/integration/session_management/test_nidigital_reservation.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ def test___single_session_reserved___initialize_nidigital_session___creates_sing
2525
session_info = stack.enter_context(reservation.initialize_nidigital_session())
2626

2727
assert session_info.session is not None
28-
assert session_info.session_name == "DigitalPattern1"
28+
assert (
29+
session_info.session_name == "DigitalPattern1"
30+
or session_info.session_name == "niDigitalPattern-DigitalPattern1"
31+
)
2932

3033

3134
def test___multiple_sessions_reserved___initialize_nidigital_sessions___creates_multiple_sessions(

0 commit comments

Comments
 (0)