2019-07-25 18:33:04

by Stotland, Inga

Subject: [PATCH BlueZ] test/test-mesh: Initialize required properties

This initialized required "Models" and "VendorModels" properties
wheher the actual models exist or not, according to the mesh-api.txt.
In case when an element does not contain either SIG defined models or
vendor defineed models, the corresponding properties should contain
empty arrays.
---
test/test-mesh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/test-mesh b/test/test-mesh
index 6e9196366..3c5ded7b3 100755
--- a/test/test-mesh
+++ b/test/test-mesh
@@ -537,10 +537,8 @@ class Element(dbus.service.Object):
sig_models = self._get_sig_models()

props = {'Index' : dbus.Byte(self.index)}
- if len(sig_models) != 0:
- props['Models'] = dbus.Array(sig_models, signature='q')
- if len(vendor_models) != 0:
- props['VendorModels'] = dbus.Array(vendor_models,
+ props['Models'] = dbus.Array(sig_models, signature='q')
+ props['VendorModels'] = dbus.Array(vendor_models,
signature='(qq)')
#print(props)
return { MESH_ELEMENT_IFACE: props }
--
2.21.0

2019-07-26 19:22:42

by Gix, Brian

Subject: Re: [PATCH BlueZ] test/test-mesh: Initialize required properties

Applied

On Thu, 2019-07-25 at 11:31 -0700, Inga Stotland wrote:
> This initialized required "Models" and "VendorModels" properties
> wheher the actual models exist or not, according to the mesh-api.txt.
> In case when an element does not contain either SIG defined models or
> vendor defineed models, the corresponding properties should contain
> empty arrays.
> ---
> test/test-mesh | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/test/test-mesh b/test/test-mesh
> index 6e9196366..3c5ded7b3 100755
> --- a/test/test-mesh
> +++ b/test/test-mesh
> @@ -537,10 +537,8 @@ class Element(dbus.service.Object):
> sig_models = self._get_sig_models()
>
> props = {'Index' : dbus.Byte(self.index)}
> - if len(sig_models) != 0:
> - props['Models'] = dbus.Array(sig_models, signature='q')
> - if len(vendor_models) != 0:
> - props['VendorModels'] = dbus.Array(vendor_models,
> + props['Models'] = dbus.Array(sig_models, signature='q')
> + props['VendorModels'] = dbus.Array(vendor_models,
> signature='(qq)')
> #print(props)
> return { MESH_ELEMENT_IFACE: props }