Fix tests

Author: puddly

tests/test_ash.py

@@ -438,10 +438,7 @@ async def test_ash_protocol_startup(caplog):
 
     assert ezsp.reset_received.mock_calls == [call(t.NcpResetCode.RESET_SOFTWARE)]
     assert protocol._write_frame.mock_calls == [
-        # We send three
-        call(ash.RstFrame(), prefix=(ash.Reserved.CANCEL,)),
-        call(ash.RstFrame(), prefix=(ash.Reserved.CANCEL,)),
-        call(ash.RstFrame(), prefix=(ash.Reserved.CANCEL,)),
+        call(ash.RstFrame(), prefix=40 * (ash.Reserved.CANCEL,))
     ]
 
     protocol._write_frame.reset_mock()

tests/test_ezsp.py

@@ -299,12 +299,12 @@ async def test_ezsp_connect_failure(disconnect_mock, reset_mock, version_mock):
             await ezsp.connect()
 
     assert conn_mock.await_count == 1
-    assert reset_mock.await_count == 5
-    assert version_mock.await_count == 5
+    assert reset_mock.await_count == 3
+    assert version_mock.await_count == 3
     assert disconnect_mock.call_count == 1
 
 
-@pytest.mark.parametrize("failures_before_success", [1, 2, 3, 4])
+@pytest.mark.parametrize("failures_before_success", [1, 2])
 @patch.object(EZSP, "disconnect", new_callable=AsyncMock)
 async def test_ezsp_connect_retry_success(disconnect_mock, failures_before_success):
     """Test connection succeeding after N failures."""
@@ -319,7 +319,7 @@ async def startup_reset_mock():
     with patch("bellows.uart.connect"):
         ezsp = make_ezsp(version=4)
 
-        with patch.object(ezsp, "startup_reset", side_effect=startup_reset_mock):
+        with patch.object(ezsp, "_startup_reset", side_effect=startup_reset_mock):
             await ezsp.connect()
 
     assert call_count == failures_before_success + 1