fixed failing tests

Opentrons · Apr 22, 2024 · 7bbc78b · 7bbc78b
1 parent 635d00a
commit 7bbc78b
Show file tree

Hide file tree

Showing 3 changed files with 723 additions and 213 deletions.
diff --git a/api/tests/opentrons/protocol_engine/commands/test_hash_command_params.py b/api/tests/opentrons/protocol_engine/commands/test_hash_command_params.py
@@ -38,7 +38,7 @@ def test_nonequivalent_commands() -> None:
         params=commands.BlowOutInPlaceParams(
             pipetteId="abc123",
             flowRate=123,
-        )
+        ), intent=CommandIntent.PROTOCOL
     )
     b = commands.WaitForDurationCreate(
         params=commands.WaitForDurationParams(seconds=123)
@@ -52,10 +52,10 @@ def test_nonequivalent_commands() -> None:
 def test_repeated_commands() -> None:
     """Repeated commands should hash differently, even though they're equivalent in isolation."""
     a = commands.WaitForDurationCreate(
-        params=commands.WaitForDurationParams(seconds=123)
+        params=commands.WaitForDurationParams(seconds=123), intent=CommandIntent.PROTOCOL
     )
     b = commands.WaitForDurationCreate(
-        params=commands.WaitForDurationParams(seconds=123)
+        params=commands.WaitForDurationParams(seconds=123), intent=CommandIntent.PROTOCOL
     )
 
     a_hash = hash_protocol_command_params(a, None)

diff --git a/api/tests/opentrons/protocol_engine/state/test_command_view_old.py b/api/tests/opentrons/protocol_engine/state/test_command_view_old.py
@@ -145,7 +145,7 @@ def test_get_next_to_execute_returns_first_queued() -> None:
 
 @pytest.mark.parametrize(
     "queue_status",
-    [QueueStatus.SETUP, QueueStatus.RUNNING, QueueStatus.AWAITING_RECOVERY],
+    [QueueStatus.SETUP, QueueStatus.RUNNING],
 )
 def test_get_next_to_execute_prioritizes_setup_command_queue(
     queue_status: QueueStatus,
@@ -157,7 +157,7 @@ def test_get_next_to_execute_prioritizes_setup_command_queue(
         queued_setup_command_ids=["setup-command-id"],
     )
 
-    assert subject.get_next_to_execute() is None
+    assert subject.get_next_to_execute() == "setup-command-id"
 
 
 @pytest.mark.parametrize(