Skip to content

Commit 6ff052b

Browse files
committed
[green] pace bounded native USB workspace observations
Signed-off-by: Viwat Vchirawongkwin <viwat.v@chula.ac.th>
1 parent 8f9c9f7 commit 6ff052b

2 files changed

Lines changed: 25 additions & 3 deletions

File tree

‎tests/firmware_tests/hil/_v061_workspace_hardware.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,24 @@ async def observe(self, challenge, transport):
690690
"print('\\nPYBLE_WORKSPACE_OBSERVATION:'+json.dumps({"
691691
"'observation':pyble_workspace.read_boot_observation('%s'),"
692692
"'workspace_probe':%s}))" % (challenge, probe))
693+
if transport == "usb-repl" and self.binding["profile_id"] in (
694+
"waveshare-esp32-s3-lcd-147b", "rpi-pico2-w"):
695+
# Native CDC may overwrite a full TX FIFO with DTR deasserted.
696+
# Pace the SAME device-generated line, not a new receipt format.
697+
# Requested delays total at most 3400 ms, below the unchanged
698+
# absolute 12-second stdout deadline. A write return is not proof
699+
# of delivery; raw-REPL framing and the final parser still decide.
700+
source = ("import os,json,pyble_workspace,sys,time\n"
701+
"_pyble_line='\\nPYBLE_WORKSPACE_OBSERVATION:'+json.dumps({"
702+
"'observation':pyble_workspace.read_boot_observation('%s'),"
703+
"'workspace_probe':None})+'\\n'\n"
704+
"if len(_pyble_line)>1024 or any(ord(c)>127 for c in _pyble_line):\n"
705+
" raise ValueError('workspace observation exceeds ASCII output bound')\n"
706+
"time.sleep_ms(100)\n"
707+
"for _pyble_offset in range(0,len(_pyble_line),16):\n"
708+
" sys.stdout.write(_pyble_line[_pyble_offset:_pyble_offset+16])\n"
709+
" time.sleep_ms(50)\n"
710+
"time.sleep_ms(100)" % challenge)
693711
until = time.monotonic() + 15
694712
while not _usb_exact(self.binding["application_usb"], absent_ok=True,
695713
alternate=self.binding["loader_usb"]):

‎tests/firmware_tests/host/test_v061_workspace_usb_output.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
66
No board, BLE, serial endpoint, firmware image, or physical receipt is used.
77
"""
8-
import asyncio
98
import builtins
109
import copy
1110
import json
@@ -71,7 +70,7 @@ def expected_output(observation):
7170
return b"\n" + PREFIX + json.dumps({"observation": observation, "workspace_probe": None}).encode() + b"\n"
7271

7372

74-
def execute_source(source, observation, fifo):
73+
def execute_source(source, observation, fifo, *, inspect_spies=None):
7574
getter = mock.Mock(return_value=copy.deepcopy(observation))
7675
serializer = mock.Mock(wraps=json.dumps)
7776
modules = {"os": SimpleNamespace(statvfs=mock.Mock(side_effect=AssertionError("refusal cannot probe filesystem"))),
@@ -85,6 +84,8 @@ def imported(name, *args, **kwargs):
8584
def printed(*values, sep=" ", end="\n"):
8685
fifo.write(sep.join(str(value) for value in values) + end)
8786
environment = {"__builtins__": {**vars(builtins), "__import__": imported, "print": printed}}
87+
if inspect_spies:
88+
inspect_spies(getter, serializer)
8889
exec(compile(source, "<host-generated-readonly-query>", "exec"), environment)
8990
return getter, serializer
9091

@@ -146,11 +147,14 @@ async def test_native_query_serializes_once_before_any_delays(self):
146147
source = await self.source_for()
147148
observation = self.observation()
148149
fifo = OverwritableFIFO()
150+
spies = []
149151
def mutate():
152+
self.assertEqual([spy.call_count for spy in spies], [1, 1])
150153
observation["mount_attempts"] = 65535
151154
wanted = expected_output(observation)
152155
fifo.on_sleep = mutate
153-
getter, serializer = execute_source(source, observation, fifo)
156+
getter, serializer = execute_source(
157+
source, observation, fifo, inspect_spies=lambda *values: spies.extend(values))
154158
self.assertEqual(fifo.finish(), wanted)
155159
getter.assert_called_once()
156160
serializer.assert_called_once()

0 commit comments

Comments
 (0)