Skip to content

Commit 19a9d47

Browse files
authored
Remove all grpc_xfail for AB#2393811 and requiring newer gRPC Device … (#617)
* Remove all grpc_xfail for AB#2393811 and requiring newer gRPC Device Server * Updates for linting errors
1 parent 3a990c6 commit 19a9d47

13 files changed

+1
-127
lines changed

tests/acceptance/test_internationalization.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ def test___supported_encoding___reset_nonexistent_device___returns_error_with_de
4747
assert exc_info.value.error_code == DAQmxErrors.INVALID_DEVICE_ID
4848

4949

50-
@pytest.mark.grpc_xfail(
51-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
52-
raises=DaqError,
53-
)
5450
@pytest.mark.parametrize(
5551
"file_path, supported_encodings",
5652
[
@@ -71,10 +67,6 @@ def test___supported_encoding___logging_file_path___returns_assigned_value(
7167
assert ai_task.in_stream.logging_file_path == pathlib.Path(file_path)
7268

7369

74-
@pytest.mark.grpc_xfail(
75-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
76-
raises=DaqError,
77-
)
7870
@pytest.mark.parametrize(
7971
"file_path, supported_encodings",
8072
[
@@ -96,10 +88,6 @@ def test___supported_encoding___configure_logging___returns_assigned_values(
9688
assert ai_task.in_stream.logging_file_path == pathlib.Path(file_path)
9789

9890

99-
@pytest.mark.grpc_xfail(
100-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
101-
raises=DaqError,
102-
)
10391
@pytest.mark.parametrize(
10492
"file_path, supported_encodings",
10593
[

tests/acceptance/test_multi_threading.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
from nidaqmx import Task
1515
from nidaqmx.constants import AcquisitionType
16-
from nidaqmx.errors import RpcError
1716
from nidaqmx.system import Device, System
1817
from nidaqmx.task.channels import AIChannel
1918
from tests.helpers import generate_random_seed
@@ -201,9 +200,6 @@ def test___shared_interpreter___run_multiple_acquisitions_with_events___callback
201200
assert all(status == 0 for status in done_statuses)
202201

203202

204-
@pytest.mark.grpc_xfail(
205-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
206-
)
207203
def test___shared_interpreter___unregister_events_during_other_acquisitions_with_events___callbacks_invoked(
208204
init_kwargs,
209205
multi_threading_test_devices: Sequence[Device],

tests/component/system/test_device.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import pytest
2-
3-
from nidaqmx.errors import RpcError
41
from nidaqmx.system import Device
52

63

@@ -38,9 +35,6 @@ def test___self_test_device___no_errors(sim_6363_device: Device) -> None:
3835
sim_6363_device.self_test_device()
3936

4037

41-
@pytest.mark.grpc_xfail(
42-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
43-
)
4438
def test___restore_last_ext_cal_const___no_errors(sim_6363_device: Device) -> None:
4539
sim_6363_device.restore_last_ext_cal_const()
4640

tests/component/system/test_device_properties.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ def test___device___list_of_float_property___returns_value(device):
5858
assert ai_bridge_ranges == [-0.025, 0.025, -0.1, 0.1]
5959

6060

61-
@pytest.mark.grpc_xfail(
62-
reason="Requires NI gRPC Device Server version 2.2 or later",
63-
raises=DaqError,
64-
)
6561
@pytest.mark.device_name("bridgeTester")
6662
def test___device___list_of_enum_property___returns_value(device):
6763
ai_trigger_usage = device.ai_trig_usage

tests/component/system/test_physical_channel_properties.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ def test___physical_channel_with_teds___get_bit_stream___returns_configured_valu
4242
assert (phys_chan.teds_bit_stream == expected_value).all()
4343

4444

45-
@pytest.mark.grpc_xfail(reason="Requires NI gRPC Device Server version 2.2 or later")
4645
def test___physical_channel___get_int32_array_property___returns_default_value(
4746
sim_6363_device,
4847
):

tests/component/task/test_in_stream.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import nidaqmx
88
import nidaqmx.system
99
from nidaqmx.constants import AcquisitionType, LoggingMode, LoggingOperation
10-
from nidaqmx.errors import DaqError
1110

1211
# With a simulated X Series, setting ai_max/min to +/-2.5 V coerces the hardware range
1312
# to +/-5 V and generates a noisy sine wave with range +/-2.5 V (raw: about +/-16383).
@@ -196,10 +195,6 @@ def test___odd_sized_array___read_into___returns_whole_samples_and_clears_paddin
196195
assert data[-1] == 0 # not FULLSCALE_RAW_MIN
197196

198197

199-
@pytest.mark.grpc_xfail(
200-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
201-
raises=DaqError,
202-
)
203198
def test___valid_path___configure_logging___returns_assigned_values(ai_task: nidaqmx.Task):
204199
expected_file_path = "Testing File.tdms"
205200
expected_group_name = "Task"
@@ -219,10 +214,6 @@ def test___valid_path___configure_logging___returns_assigned_values(ai_task: nid
219214
assert ai_task.in_stream.logging_tdms_operation == expected_logging_operation
220215

221216

222-
@pytest.mark.grpc_xfail(
223-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
224-
raises=DaqError,
225-
)
226217
def test___valid_path___start_new_file___returns_assigned_value(ai_task: nidaqmx.Task):
227218
expected_file_path = "Testing File.tdms"
228219
ai_task.in_stream.start_new_file(expected_file_path)

tests/component/task/test_in_stream_read_properties.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import pytest
44

55
from nidaqmx.constants import OverwriteMode, ReadRelativeTo
6-
from nidaqmx.errors import DaqError
76
from nidaqmx.task import Task
87

98

@@ -123,38 +122,22 @@ def test___ai_task___reset_bool_property___returns_default_value(ai_task: Task):
123122
assert not ai_task.in_stream.logging_pause
124123

125124

126-
@pytest.mark.grpc_xfail(
127-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
128-
raises=DaqError,
129-
)
130125
def test___ai_task___get_string_property___returns_default_value(ai_task: Task):
131126
assert ai_task.in_stream.logging_file_path is None
132127

133128

134-
@pytest.mark.grpc_xfail(
135-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
136-
raises=DaqError,
137-
)
138129
def test___ai_task___set_string_property___returns_assigned_value(ai_task: Task):
139130
ai_task.in_stream.logging_file_path = "TestData.tdms" # type: ignore[assignment] # https://github.com/ni/nidaqmx-python/issues/613
140131

141132
assert ai_task.in_stream.logging_file_path == pathlib.Path("TestData.tdms")
142133

143134

144-
@pytest.mark.grpc_xfail(
145-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
146-
raises=DaqError,
147-
)
148135
def test___ai_task___set_string_property_none___returns_default_value(ai_task: Task):
149136
ai_task.in_stream.logging_file_path = None
150137

151138
assert ai_task.in_stream.logging_file_path is None
152139

153140

154-
@pytest.mark.grpc_xfail(
155-
reason="AB#2393811: DAQmxGetLoggingFilePath returns kErrorNULLPtr (-200604) when called from grpc-device.",
156-
raises=DaqError,
157-
)
158141
def test___ai_task___reset_string_property___returns_default_value(ai_task: Task):
159142
ai_task.in_stream.logging_file_path = "TestData.tdms" # type: ignore[assignment] # https://github.com/ni/nidaqmx-python/issues/613
160143

tests/component/test_task.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import nidaqmx.system
55
from nidaqmx.constants import ShuntCalSelect, ShuntCalSource, ShuntElementLocation
66
from nidaqmx.error_codes import DAQmxErrors
7-
from nidaqmx.errors import RpcError
87
from nidaqmx.system.storage import PersistedChannel
98

109

@@ -61,9 +60,6 @@ def test___tasks_with_different_names___hash___not_equal(generate_task):
6160
assert hash(task1) != hash(task2)
6261

6362

64-
@pytest.mark.grpc_xfail(
65-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
66-
)
6763
@pytest.mark.device_name("bridgeTester")
6864
@pytest.mark.parametrize("skip_unsupported_channels", [True, False])
6965
def test___arguments_specified___perform_bridge_offset_nulling_cal___no_errors(
@@ -74,9 +70,6 @@ def test___arguments_specified___perform_bridge_offset_nulling_cal___no_errors(
7470
)
7571

7672

77-
@pytest.mark.grpc_xfail(
78-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
79-
)
8073
@pytest.mark.device_name("bridgeTester")
8174
def test___default_arguments___perform_bridge_offset_nulling_cal___no_errors(
8275
ai_bridge_task: nidaqmx.Task,
@@ -85,9 +78,6 @@ def test___default_arguments___perform_bridge_offset_nulling_cal___no_errors(
8578

8679

8780
@pytest.mark.device_name("bridgeTester")
88-
@pytest.mark.grpc_xfail(
89-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
90-
)
9181
@pytest.mark.parametrize(
9282
"shunt_resistor_value, shunt_resistor_location, shunt_resistor_select, shunt_resistor_source, bridge_resistance, skip_unsupported_channels",
9383
[
@@ -122,9 +112,6 @@ def test___perform_bridge_shunt_cal___no_errors(
122112

123113

124114
@pytest.mark.device_name("bridgeTester")
125-
@pytest.mark.grpc_xfail(
126-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
127-
)
128115
def test___perform_bridge_shunt_cal_default___no_errors(
129116
ai_bridge_task: nidaqmx.Task,
130117
) -> None:
@@ -136,9 +123,6 @@ def test___perform_bridge_shunt_cal_default___no_errors(
136123

137124

138125
@pytest.mark.device_name("bridgeTester")
139-
@pytest.mark.grpc_xfail(
140-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
141-
)
142126
@pytest.mark.parametrize(
143127
"shunt_resistor_value, shunt_resistor_location, shunt_resistor_select, shunt_resistor_source, skip_unsupported_channels",
144128
[
@@ -171,9 +155,6 @@ def test___perform_strain_shunt_cal___no_errors(
171155

172156

173157
@pytest.mark.device_name("bridgeTester")
174-
@pytest.mark.grpc_xfail(
175-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
176-
)
177158
def test___perform_strain_shunt_cal_default___no_errors(
178159
ai_strain_gage_task: nidaqmx.Task,
179160
) -> None:
@@ -184,9 +165,6 @@ def test___perform_strain_shunt_cal_default___no_errors(
184165
raise
185166

186167

187-
@pytest.mark.grpc_xfail(
188-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
189-
)
190168
@pytest.mark.device_name("cDAQ1Mod2")
191169
@pytest.mark.parametrize("skip_unsupported_channels", [True, False])
192170
def test___arguments_specified___perform_thrmcpl_lead_offset_nulling_cal___no_errors(
@@ -197,9 +175,6 @@ def test___arguments_specified___perform_thrmcpl_lead_offset_nulling_cal___no_er
197175
)
198176

199177

200-
@pytest.mark.grpc_xfail(
201-
reason="Requires NI gRPC Device Server version 2.5 or later", raises=RpcError
202-
)
203178
@pytest.mark.device_name("cDAQ1Mod2")
204179
def test___default_arguments___perform_thrmcpl_lead_offset_nulling_cal___no_errors(
205180
ai_thermocouple_task: nidaqmx.Task,

tests/component/test_task_events.py

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import nidaqmx.system
1111
from nidaqmx.constants import AcquisitionType, EveryNSamplesEventType, Signal
1212
from nidaqmx.error_codes import DAQmxErrors
13-
from nidaqmx.errors import DaqResourceWarning, RpcError
13+
from nidaqmx.errors import DaqResourceWarning
1414
from nidaqmx.task import _TaskEventType
1515
from tests._event_utils import (
1616
DoneEventObserver,
@@ -212,9 +212,6 @@ def test___signal_event_registered___run_finite_acquisition___callback_invoked_n
212212
assert all(e.signal_type == Signal.SAMPLE_COMPLETE.value for e in event_observer.events)
213213

214214

215-
@pytest.mark.grpc_xfail(
216-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
217-
)
218215
def test___done_event_unregistered___run_finite_acquisition___callback_not_invoked(
219216
ai_task: nidaqmx.Task,
220217
) -> None:
@@ -233,9 +230,6 @@ def test___done_event_unregistered___run_finite_acquisition___callback_not_invok
233230
assert len(event_observer.events) == 0
234231

235232

236-
@pytest.mark.grpc_xfail(
237-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
238-
)
239233
def test___every_n_samples_event_unregistered___run_finite_acquisition___callback_not_invoked(
240234
ai_task: nidaqmx.Task,
241235
) -> None:
@@ -256,9 +250,6 @@ def test___every_n_samples_event_unregistered___run_finite_acquisition___callbac
256250
assert len(event_observer.events) == 0
257251

258252

259-
@pytest.mark.grpc_xfail(
260-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
261-
)
262253
def test___signal_event_unregistered___run_finite_acquisition___callback_not_invoked(
263254
ai_task_with_real_device: nidaqmx.Task,
264255
) -> None:
@@ -326,9 +317,6 @@ def test___done_and_every_n_samples_events_registered___run_multiple_finite_acqu
326317
)
327318

328319

329-
@pytest.mark.grpc_xfail(
330-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
331-
)
332320
def test___ai_task____run_multiple_finite_acquisitions_with_varying_every_n_samples_event_interval___callbacks_invoked(
333321
ai_task: nidaqmx.Task,
334322
) -> None:
@@ -361,9 +349,6 @@ def test___ai_task____run_multiple_finite_acquisitions_with_varying_every_n_samp
361349
] == every_n_samples_event_counts
362350

363351

364-
@pytest.mark.grpc_xfail(
365-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=AssertionError
366-
)
367352
def test___done_event_registered___register_done_event___already_registered_error_raised(
368353
ai_task: nidaqmx.Task,
369354
) -> None:
@@ -379,9 +364,6 @@ def test___done_event_registered___register_done_event___already_registered_erro
379364
assert exc_info.value.error_code == DAQmxErrors.DONE_EVENT_ALREADY_REGISTERED
380365

381366

382-
@pytest.mark.grpc_xfail(
383-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=AssertionError
384-
)
385367
def test___every_n_samples_acquired_into_buffer_event_registered___register_every_n_samples_acquired_into_buffer_event___already_registered_error_raised(
386368
ai_task: nidaqmx.Task,
387369
) -> None:
@@ -404,9 +386,6 @@ def test___every_n_samples_acquired_into_buffer_event_registered___register_ever
404386
)
405387

406388

407-
@pytest.mark.grpc_xfail(
408-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=AssertionError
409-
)
410389
def test___every_n_samples_transferred_from_buffer_event_registered___register_every_n_samples_transferred_from_buffer_event___already_registered_error_raised(
411390
ao_task: nidaqmx.Task,
412391
) -> None:
@@ -429,7 +408,6 @@ def test___every_n_samples_transferred_from_buffer_event_registered___register_e
429408
)
430409

431410

432-
@pytest.mark.grpc_xfail(reason="Requires NI gRPC Device Server version 2.2 or later")
433411
def test___signal_event_registered___register_signal_event___already_registered_error_raised(
434412
ai_task: nidaqmx.Task,
435413
) -> None:
@@ -445,7 +423,6 @@ def test___signal_event_registered___register_signal_event___already_registered_
445423
assert exc_info.value.error_code == DAQmxErrors.SIGNAL_EVENT_ALREADY_REGISTERED
446424

447425

448-
@pytest.mark.grpc_xfail(reason="Requires NI gRPC Device Server version 2.2 or later")
449426
def test___ai_task___register_wrong_every_n_samples_event___not_supported_by_device_error_raised(
450427
ai_task: nidaqmx.Task,
451428
) -> None:
@@ -465,7 +442,6 @@ def test___ai_task___register_wrong_every_n_samples_event___not_supported_by_dev
465442
)
466443

467444

468-
@pytest.mark.grpc_xfail(reason="Requires NI gRPC Device Server version 2.2 or later")
469445
def test___ao_task___register_wrong_every_n_samples_event___not_supported_by_device_error_raised(
470446
ao_task: nidaqmx.Task,
471447
) -> None:
@@ -485,7 +461,6 @@ def test___ao_task___register_wrong_every_n_samples_event___not_supported_by_dev
485461
)
486462

487463

488-
@pytest.mark.grpc_xfail(reason="Requires NI gRPC Device Server version 2.2 or later")
489464
def test___task___register_unregister_done_event___callback_not_invoked(
490465
ai_task: nidaqmx.Task,
491466
) -> None:
@@ -498,9 +473,6 @@ def test___task___register_unregister_done_event___callback_not_invoked(
498473
assert len(event_observer.events) == 0
499474

500475

501-
@pytest.mark.grpc_xfail(
502-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
503-
)
504476
def test___task___register_unregister_every_n_samples_acquired_into_buffer_event___callback_not_invoked(
505477
ai_task: nidaqmx.Task,
506478
) -> None:
@@ -515,9 +487,6 @@ def test___task___register_unregister_every_n_samples_acquired_into_buffer_event
515487
assert len(event_observer.events) == 0
516488

517489

518-
@pytest.mark.grpc_xfail(
519-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
520-
)
521490
def test___task___register_unregister_every_n_samples_transferred_from_buffer_event___callback_not_invoked(
522491
ao_task: nidaqmx.Task,
523492
) -> None:
@@ -532,9 +501,6 @@ def test___task___register_unregister_every_n_samples_transferred_from_buffer_ev
532501
assert len(event_observer.events) == 0
533502

534503

535-
@pytest.mark.grpc_xfail(
536-
reason="Requires NI gRPC Device Server version 2.2 or later", raises=RpcError
537-
)
538504
def test___task___register_unregister_signal_event___callback_not_invoked(
539505
ai_task: nidaqmx.Task,
540506
) -> None:

0 commit comments

Comments
 (0)