fix: remove device_type fields (came from a bad merge)

AllenNeuralDynamics · Jan 27, 2025 · 695085d · 695085d
1 parent 1396653
commit 695085d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/tests/test_inst_acq_compatibility.py b/tests/test_inst_acq_compatibility.py
@@ -740,10 +740,9 @@ def read_json(filepath: Path) -> dict:
                         name="Left spout",
                         side=d.SpoutSide.LEFT,
                         spout_diameter=1.2,
-                        solenoid_valve=d.Device(device_type="Solenoid", name="Solenoid Left"),
+                        solenoid_valve=d.Device(name="Solenoid Left"),
                         lick_sensor=d.Device(
                             name="Janelia_Lick_Detector Left",
-                            device_type="Lick detector",
                             manufacturer=d.Organization.JANELIA,
                         ),
                         lick_sensor_type=d.LickSensorType("Capacitive"),
@@ -752,10 +751,9 @@ def read_json(filepath: Path) -> dict:
                         name="Right spout",
                         side=d.SpoutSide.RIGHT,
                         spout_diameter=1.2,
-                        solenoid_valve=d.Device(device_type="Solenoid", name="Solenoid Right"),
+                        solenoid_valve=d.Device(name="Solenoid Right"),
                         lick_sensor=d.Device(
                             name="Janelia_Lick_Detector Right",
-                            device_type="Lick detector",
                             manufacturer=d.Organization.JANELIA,
                         ),
                         lick_sensor_type=d.LickSensorType("Capacitive"),

diff --git a/tests/test_procedures.py b/tests/test_procedures.py
@@ -215,7 +215,6 @@ def test_injection_material_check(self):
                             probes=[
                                 OphysProbe(
                                     ophys_probe=FiberProbe(
-                                        device_type="Fiber optic probe",
                                         name="Probe A",
                                         manufacturer=Organization.DORIC,
                                         model="8",