test: add test for controller to call destroy controller.off

csaxs_bec/devices/npoint/npoint.py

@@ -442,9 +442,14 @@ class NPointAxis(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/galil/fgalil_ophyd.py

@@ -212,9 +212,14 @@ class FlomniGalilMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/galil/fupr_ophyd.py

@@ -185,9 +185,14 @@ class FuprGalilMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/galil/lgalil_ophyd.py

@@ -170,9 +170,14 @@ class LamniGalilMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/galil/ogalil_ophyd.py

@@ -324,9 +324,14 @@ class OMNYGalilMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/galil/sgalil_ophyd.py

@@ -530,9 +530,14 @@ class SGalilMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py

@@ -678,9 +678,14 @@ class RtFlomniMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py

@@ -588,9 +588,14 @@ class RtLamniMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/omny/rt/rt_omny_ophyd.py

@@ -1119,9 +1119,14 @@ class RtOMNYMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

csaxs_bec/devices/smaract/smaract_ophyd.py

@@ -153,9 +153,14 @@ class SmaractMotor(Device, PositionerBase):
             self.low_limit_travel.put(limits[0])
             self.high_limit_travel.put(limits[1])
 
-    def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool:
+    def wait_for_connection(self, timeout: float = 30.0) -> bool:
         self.controller.on(timeout=timeout)
 
+    def destroy(self):
+        """Make sure to turn off the controller socket on destroy."""
+        self.controller.off(update_config=False)
+        return super().destroy()
+
     @property
     def limits(self):
         return (self.low_limit_travel.get(), self.high_limit_travel.get())

tests/tests_devices/test_galil.py

@@ -207,6 +207,15 @@ def test_wait_for_connection_called():
 
                 motor.wait_for_connection(timeout=5.0)
                 assert mock_on.call_args_list[-1] == mock.call(timeout=5.0)
+
+            # Make sure destroy calls controller off
+
+            with mock.patch.object(motor.controller, "off") as mock_off:
+                motor.destroy()
+                assert mock_off.call_count == 1
+                assert mock_off.call_args_list[0] == mock.call(update_config=False)
+                assert motor._destroyed is True
+
         finally:
             controller_cls._reset_controller()
             controller_cls._axes_per_controller = ctrl_axis_backup