Skip to content

Commit 5aa2179

Browse files
Merge branch 'dev' into fix-test
2 parents 2a2b28a + 7610a62 commit 5aa2179

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Yakut
1+
# Yakut – Cyphal CLI tool
22

33
<!--suppress CheckImageSize, HtmlDeprecatedAttribute -->
44
<img src="/docs/opencyphal-favicon-512.png" alt="OpenCyphal logo" width=128 align=right>
@@ -23,8 +23,6 @@ Afterward do endeavor to read the docs: **`yakut --help`**
2323

2424
Check for new versions every now and then: **`pip install --upgrade yakut`**
2525

26-
Installation & configuration screencasts are available for [Windows](https://forum.opencyphal.org/t/screencast-of-installing-configuring-yakut/1197/2?u=pavel.kirienko), [GNU/Linux](https://forum.opencyphal.org/t/screencast-of-installing-configuring-yakut/1197/1?u=pavel.kirienko), and [macOS](https://www.youtube.com/watch?v=dQw4w9WgXcQ).
27-
2826
### Additional third-party tools
2927

3028
Since Yakut heavily relies on YAML/JSON documents exchanged via stdin/stdout, [**`jq`**](https://stedolan.github.io/jq/) is often needed for any non-trivial usage of the tool, so consider installing it as well. Users of GNU/Linux will likely find it in the default software repositories (`pacman -S jq`, `apt install jq`, etc.).
@@ -33,9 +31,9 @@ Since Yakut heavily relies on YAML/JSON documents exchanged via stdin/stdout, [*
3331

3432
Transport layer inspection tools:
3533

34+
- [Wireshark](https://www.wireshark.org/) with [Cyphal plugins](https://github.com/OpenCyphal/wireshark_plugins)
35+
(n.b.: some versions of Wireshark may label Cyphal/CAN captures as UAVCAN/CAN due to rebranding).
3636
- Cyphal/CAN on GNU/Linux (candump, canbusload, etc.): [`can-utils`](https://github.com/linux-can/can-utils)
37-
- Cyphal/UDP or Cyphal/CAN: [Wireshark](https://www.wireshark.org/)
38-
(n.b.: Wireshark might label Cyphal captures as UAVCAN due to rebranding)
3937

4038
## Invoking commands
4139

tests/cmd/file_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ async def _unittest_file_server_pnp(compiled_dsdl: typing.Any) -> None:
4848
),
4949
)
5050
try:
51-
fc = FileClient(cln_node, 42, response_timeout=15.0)
51+
fc = FileClient(cln_node, 42, response_timeout=30.0) # Large timeout is needed for Windows CI.
5252
await asyncio.sleep(3.0) # Let the server initialize.
5353
assert srv_proc.alive
5454

tests/cmd/pubsub.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ def _unittest_pub_sub_regular(transport_factory: TransportFactory, compiled_dsdl
103103
time.sleep(1.0) # Time to sync up
104104

105105
# Parse the output from the subscribers and validate it.
106-
out_sub_heartbeat = proc_sub_heartbeat.wait(1.0, interrupt=True)[1].splitlines()
107-
out_sub_diagnostic = proc_sub_diagnostic.wait(1.0, interrupt=True)[1].splitlines()
108-
out_sub_temperature = proc_sub_temperature.wait(1.0, interrupt=True)[1].splitlines()
106+
out_sub_heartbeat = proc_sub_heartbeat.wait(5, interrupt=True)[1].splitlines()
107+
out_sub_diagnostic = proc_sub_diagnostic.wait(5, interrupt=True)[1].splitlines()
108+
out_sub_temperature = proc_sub_temperature.wait(5, interrupt=True)[1].splitlines()
109109

110110
heartbeats = list(map(json.loads, out_sub_heartbeat))
111111
diagnostics = list(map(json.loads, out_sub_diagnostic))
@@ -142,7 +142,7 @@ def _unittest_pub_sub_regular(transport_factory: TransportFactory, compiled_dsdl
142142
assert all(map(lambda mt: mt["555"]["kelvin"] == pytest.approx(123.456), temperatures))
143143

144144
assert proc_sub_diagnostic_wrong_pid.alive
145-
assert proc_sub_diagnostic_wrong_pid.wait(1.0, interrupt=True)[1].strip() == ""
145+
assert proc_sub_diagnostic_wrong_pid.wait(5, interrupt=True)[1].strip() == ""
146146

147147

148148
def _unittest_slow_cli_pub_sub_anon(transport_factory: TransportFactory, compiled_dsdl: typing.Any) -> None:
@@ -187,9 +187,9 @@ def _unittest_slow_cli_pub_sub_anon(transport_factory: TransportFactory, compile
187187

188188
time.sleep(2.0) # Time to sync up
189189

190-
assert proc_sub_heartbeat.wait(1.0, interrupt=True)[1].strip() == "", "Anonymous nodes must not broadcast heartbeat"
190+
assert proc_sub_heartbeat.wait(5, interrupt=True)[1].strip() == "", "Anonymous nodes must not broadcast heartbeat"
191191

192-
diagnostics = list(json.loads(s) for s in proc_sub_diagnostic_with_meta.wait(1.0, interrupt=True)[1].splitlines())
192+
diagnostics = list(json.loads(s) for s in proc_sub_diagnostic_with_meta.wait(5, interrupt=True)[1].splitlines())
193193
print("diagnostics:", diagnostics)
194194
# Remember that anonymous transfers over redundant transports are NOT deduplicated.
195195
# Hence, to support the case of redundant transports, we use 'greater or equal' here.
@@ -201,7 +201,7 @@ def _unittest_slow_cli_pub_sub_anon(transport_factory: TransportFactory, compile
201201
assert m["8184"]["timestamp"]["microsecond"] == 0
202202
assert m["8184"]["text"] == ""
203203

204-
diagnostics = list(json.loads(s) for s in proc_sub_diagnostic_no_meta.wait(1.0, interrupt=True)[1].splitlines())
204+
diagnostics = list(json.loads(s) for s in proc_sub_diagnostic_no_meta.wait(5, interrupt=True)[1].splitlines())
205205
print("diagnostics:", diagnostics)
206206
assert len(diagnostics) >= 2 # >= because see above
207207
for m in diagnostics:

0 commit comments

Comments
 (0)