Skip to contentSkip to conversation

test/test-mesh: Initialize required properties

PATCH Applied Inga Stotland 2 participants 2 messages Jul 25, 2019 – Jul 26, 2019 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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(-)
test/test-mesh +2 -4
index 6e9196366..3c5ded7b3 100755
@@ -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 }
Signature · 1 line
2.21.0
Applied
#1 lore raw

Applied

Quoted 26 lines · Inga Stotland

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(-)
test/test-mesh +2 -4
index 6e9196366..3c5ded7b3 100755
@@ -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 }