@@ -53,15 +53,9 @@ def test_read(dev: Any):
5353 res = dev .samx .read (cached = True )
5454 mock_get .assert_called_once_with (MessageEndpoints .device_readback ("samx" ))
5555 assert res == {
56- "samx" : messages .SignalReading .model_validate (
57- {"value" : 0 , "timestamp" : 1701105880.1711318 }
58- ),
59- "samx_setpoint" : messages .SignalReading .model_validate (
60- {"value" : 0 , "timestamp" : 1701105880.1693492 }
61- ),
62- "samx_motor_is_moving" : messages .SignalReading .model_validate (
63- {"value" : 0 , "timestamp" : 1701105880.16935 }
64- ),
56+ "samx" : {"value" : 0 , "timestamp" : 1701105880.1711318 },
57+ "samx_setpoint" : {"value" : 0 , "timestamp" : 1701105880.1693492 },
58+ "samx_motor_is_moving" : {"value" : 0 , "timestamp" : 1701105880.16935 },
6559 }
6660
6761
@@ -77,25 +71,15 @@ def test_read_filtered_hints(dev: Any):
7771 )
7872 res = dev .samx .read (cached = True , filter_to_hints = True )
7973 mock_get .assert_called_once_with (MessageEndpoints .device_readback ("samx" ))
80- assert res == {
81- "samx" : messages .SignalReading .model_validate (
82- {"value" : 0 , "timestamp" : 1701105880.1711318 }
83- )
84- }
74+ assert res == {"samx" : {"value" : 0 , "timestamp" : 1701105880.1711318 }}
8575
8676
8777def test_read_use_read (dev : Any ):
8878 with mock .patch .object (dev .samx .root .parent .connector , "get" ) as mock_get :
8979 data = {
90- "samx" : messages .SignalReading .model_validate (
91- {"value" : 0 , "timestamp" : 1701105880.1711318 }
92- ),
93- "samx_setpoint" : messages .SignalReading .model_validate (
94- {"value" : 0 , "timestamp" : 1701105880.1693492 }
95- ),
96- "samx_motor_is_moving" : messages .SignalReading .model_validate (
97- {"value" : 0 , "timestamp" : 1701105880.16935 }
98- ),
80+ "samx" : {"value" : 0 , "timestamp" : 1701105880.1711318 },
81+ "samx_setpoint" : {"value" : 0 , "timestamp" : 1701105880.1693492 },
82+ "samx_motor_is_moving" : {"value" : 0 , "timestamp" : 1701105880.16935 },
9983 }
10084 mock_get .return_value = messages .DeviceMessage (
10185 signals = data , metadata = {"scan_id" : "scan_id" , "scan_type" : "scan_type" }
@@ -108,21 +92,11 @@ def test_read_use_read(dev: Any):
10892def test_read_nested_device (dev : Any ):
10993 with mock .patch .object (dev .dyn_signals .root .parent .connector , "get" ) as mock_get :
11094 data = {
111- "dyn_signals_messages_message1" : messages .SignalReading .model_validate (
112- {"value" : 0 , "timestamp" : 1701105880.0716832 }
113- ),
114- "dyn_signals_messages_message2" : messages .SignalReading .model_validate (
115- {"value" : 0 , "timestamp" : 1701105880.071722 }
116- ),
117- "dyn_signals_messages_message3" : messages .SignalReading .model_validate (
118- {"value" : 0 , "timestamp" : 1701105880.071739 }
119- ),
120- "dyn_signals_messages_message4" : messages .SignalReading .model_validate (
121- {"value" : 0 , "timestamp" : 1701105880.071753 }
122- ),
123- "dyn_signals_messages_message5" : messages .SignalReading .model_validate (
124- {"value" : 0 , "timestamp" : 1701105880.071766 }
125- ),
95+ "dyn_signals_messages_message1" : {"value" : 0 , "timestamp" : 1701105880.0716832 },
96+ "dyn_signals_messages_message2" : {"value" : 0 , "timestamp" : 1701105880.071722 },
97+ "dyn_signals_messages_message3" : {"value" : 0 , "timestamp" : 1701105880.071739 },
98+ "dyn_signals_messages_message4" : {"value" : 0 , "timestamp" : 1701105880.071753 },
99+ "dyn_signals_messages_message5" : {"value" : 0 , "timestamp" : 1701105880.071766 },
126100 }
127101 mock_get .return_value = messages .DeviceMessage (
128102 signals = data , metadata = {"scan_id" : "scan_id" , "scan_type" : "scan_type" }
@@ -157,11 +131,7 @@ def test_read_kind_hinted(
157131 if cached :
158132 mock_get .assert_called_once_with (MessageEndpoints .device_readback ("samx" ))
159133 mock_run .assert_not_called ()
160- assert res == {
161- "samx" : messages .SignalReading .model_validate (
162- {"value" : 0 , "timestamp" : 1701105880.1711318 }
163- )
164- }
134+ assert res == {"samx" : {"value" : 0 , "timestamp" : 1701105880.1711318 }}
165135 else :
166136 mock_run .assert_called_once_with (cached = False , fcn = dev .samx .readback .read )
167137 mock_get .assert_not_called ()
0 commit comments