tests

untzag · Aug 14, 2023 · 7c1eef1 · 7c1eef1
1 parent e3c6b64
commit 7c1eef1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/tests/property/test_property.py b/tests/property/test_property.py
@@ -1,12 +1,13 @@
 import time
-import yaqc
 import happi
 import pathlib
 import appdirs
 import yaqc_bluesky
 from yaqd_core import testing
 import numpy as np
 import tempfile
+import bluesky
+from bluesky import plans as bsp
 
 
 __here__ = pathlib.Path(__file__).parent
@@ -22,5 +23,27 @@ def test_property():
     assert np.isclose(device.position, 0.222)
 
 
-if __name__ == "__main__":
-    test_property()
+@testing.run_daemon_entry_point(
+    "fake-has-transformed-position", config=__here__ / "transformed-position-config.toml"
+)
+def test_count():
+    RE = bluesky.RunEngine()
+    d = yaqc_bluesky.Device(38999)
+    RE(bsp.count([d.native_destination, d.native_position, d.native_reference_position], num=5))
+
+
+@testing.run_daemon_entry_point(
+    "fake-has-transformed-position", config=__here__ / "transformed-position-config.toml"
+)
+def test_scan():
+    RE = bluesky.RunEngine()
+    d = yaqc_bluesky.Device(38999)
+    RE(
+        bsp.scan(
+            [d.native_destination, d.native_position, d.native_reference_position],
+            d.native_destination,
+            0,
+            1,
+            15,
+        )
+    )
diff --git a/tests/property/transformed-position-config.toml b/tests/property/transformed-position-config.toml
@@ -0,0 +1,2 @@
+[optimus]
+port = 38999
diff --git a/yaqc_bluesky/_base.py b/yaqc_bluesky/_base.py
@@ -26,6 +26,7 @@ def __init__(self, yaq_client, *, name=None):
             if key in ["destination", "position"]:
                 continue
             if prop.type not in ["double"]:
+
                 continue
             self.children.append(PropertyDevice(self, key))
             if not hasattr(self, key):  # don't overwrite please

diff --git a/yaqc_bluesky/_property.py b/yaqc_bluesky/_property.py
@@ -31,9 +31,10 @@ def set(self, value) -> Status:
 
     def describe(self) -> dict:
         out = dict()
-        out[f"{self.parent.name}_{self.name}_readback"] = {"dtype": "number", "shape": []}
+        out[f"{self.parent.name}_{self.name}_readback"] = {"dtype": "number", "shape": [], "source": f"yaq:{self.parent.yaq_name}"
+}
         if self._yaq_property._property["getter"]:
-            out[f"{self.parent.name}_{self.name}_setpoint"] = {"dtype": "number", "shape": []}
+            out[f"{self.parent.name}_{self.name}_setpoint"] = {"dtype": "number", "shape": [], "source": f"yaq:{self.parent.yaq_name}"}
         return out
 
     def read(self) -> dict:
@@ -43,4 +44,3 @@ def read(self) -> dict:
         if self._yaq_property._property["getter"]:
             out[f"{self.parent.name}_{self.name}_setpoint"] = {"value": self._setpoint, "timestamp": ts}
         return out
-