fix tests for plan_stubs/wrapped

Author: EmsArnold

tests/plan_stubs/test_wrapped_stubs.py

@@ -36,56 +36,58 @@ def y_axis() -> SimMotor:
 
 
 def test_set_absolute(x_axis: SimMotor):
-    assert list(set_absolute(x_axis, 0.5)) == [Msg("set", x_axis, 0.5, group=None)]
+    msgs = list(set_absolute(x_axis, 0.5, wait=True))
+    assert len(msgs) == 2
+    assert msgs[0] == Msg("set", x_axis, 0.5, group=ANY)
+    assert msgs[1] == Msg("wait", group=msgs[0].kwargs["group"])
 
 
-def test_set_absolute_with_group(x_axis: SimMotor):
-    assert list(set_absolute(x_axis, 0.5, group="foo")) == [
-        Msg("set", x_axis, 0.5, group="foo")
+def test_set_absolute_without_wait(x_axis: SimMotor):
+    assert list(set_absolute(x_axis, 0.5, wait=False)) == [
+        Msg("set", x_axis, 0.5, group=None)
     ]
 
 
-def test_set_absolute_with_wait(x_axis: SimMotor):
-    msgs = list(set_absolute(x_axis, 0.5, wait=True))
+def test_set_absolute_with_group(x_axis: SimMotor):
+    msgs = list(set_absolute(x_axis, 0.5, group="foo"))
     assert len(msgs) == 2
-    assert msgs[0] == Msg("set", x_axis, 0.5, group=ANY)
+    assert msgs[0] == Msg("set", x_axis, 0.5, group="foo")
     assert msgs[1] == Msg("wait", group=msgs[0].kwargs["group"])
 
 
-def test_set_absolute_with_group_and_wait(x_axis: SimMotor):
-    assert list(set_absolute(x_axis, 0.5, group="foo", wait=True)) == [
-        Msg("set", x_axis, 0.5, group="foo"),
-        Msg("wait", group="foo"),
+def test_set_absolute_with_group_and_without_wait(x_axis: SimMotor):
+    assert list(set_absolute(x_axis, 0.5, group="foo", wait=False)) == [
+        Msg("set", x_axis, 0.5, group="foo")
     ]
 
 
 def test_set_relative(x_axis: SimMotor):
     assert list(set_relative(x_axis, 0.5)) == [
         Msg("locate", x_axis),
-        Msg("set", x_axis, 0.5, group=None),
+        Msg("set", x_axis, 0.5, group=ANY),
+        Msg("wait", group=ANY),
     ]
 
 
 def test_set_relative_with_group(x_axis: SimMotor):
     assert list(set_relative(x_axis, 0.5, group="foo")) == [
         Msg("locate", x_axis),
         Msg("set", x_axis, 0.5, group="foo"),
+        Msg("wait", group="foo"),
     ]
 
 
-def test_set_relative_with_wait(x_axis: SimMotor):
-    msgs = list(set_relative(x_axis, 0.5, wait=True))
-    assert len(msgs) == 3
+def test_set_relative_without_wait(x_axis: SimMotor):
+    msgs = list(set_relative(x_axis, 0.5, wait=False))
+    assert len(msgs) == 2
     assert msgs[0] == Msg("locate", x_axis)
     assert msgs[1] == Msg("set", x_axis, 0.5, group=ANY)
-    assert msgs[2] == Msg("wait", group=msgs[1].kwargs["group"])
 
 
-def test_set_relative_with_group_and_wait(x_axis: SimMotor):
-    assert list(set_relative(x_axis, 0.5, group="foo", wait=True)) == [
+def test_set_relative_with_group_and_without_wait(x_axis: SimMotor):
+    assert list(set_relative(x_axis, 0.5, group="foo", wait=False)) == [
         Msg("locate", x_axis),
         Msg("set", x_axis, 0.5, group="foo"),
-        Msg("wait", group="foo"),
     ]