2020-02-18 07:52:39

by Stotland, Inga

Subject: [PATCH BlueZ] test/test-mesh: Fix output of MessageReceived method

This fixes formatted output of recieved message parameters.
---
test/test-mesh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/test-mesh b/test/test-mesh
index 5777fcebc..929e28fd3 100755
--- a/test/test-mesh
+++ b/test/test-mesh
@@ -559,8 +559,15 @@ class Element(dbus.service.Object):
@dbus.service.method(MESH_ELEMENT_IFACE,
in_signature="qqvay", out_signature="")
def MessageReceived(self, source, key, destination, data):
- print('Message Received on Element %d, src=%04x, dst=%s' %
- self.index, source, destination)
+ print(('Message Received on Element %02x') % self.index, end='')
+ print(', src=', format(source, '04x'), end='')
+
+ if isinstance(destination, int):
+ print(', dst=%04x' % destination)
+ elif isinstance(destination, dbus.Array):
+ dst_str = array_to_string(destination)
+ print(', dst=' + dst_str)
+
for model in self.models:
model.process_message(source, key, data)

--
2.21.1

2020-02-19 02:20:29

by Gix, Brian

Subject: Re: [PATCH BlueZ] test/test-mesh: Fix output of MessageReceived method

Applied
On Mon, 2020-02-17 at 23:52 -0800, Inga Stotland wrote:
> This fixes formatted output of recieved message parameters.
> ---
> test/test-mesh | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/test/test-mesh b/test/test-mesh
> index 5777fcebc..929e28fd3 100755
> --- a/test/test-mesh
> +++ b/test/test-mesh
> @@ -559,8 +559,15 @@ class Element(dbus.service.Object):
> @dbus.service.method(MESH_ELEMENT_IFACE,
> in_signature="qqvay", out_signature="")
> def MessageReceived(self, source, key, destination, data):
> - print('Message Received on Element %d, src=%04x, dst=%s' %
> - self.index, source, destination)
> + print(('Message Received on Element %02x') % self.index, end='')
> + print(', src=', format(source, '04x'), end='')
> +
> + if isinstance(destination, int):
> + print(', dst=%04x' % destination)
> + elif isinstance(destination, dbus.Array):
> + dst_str = array_to_string(destination)
> + print(', dst=' + dst_str)
> +
> for model in self.models:
> model.process_message(source, key, data)
>