diff options
author | Thomas Haller <thaller@redhat.com> | 2018-05-15 21:04:22 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-05-24 16:40:17 +0200 |
commit | c834a8e822a4201c3d18c4c28b2305b292c70f1e (patch) | |
tree | 1782196f5078795766002e4a25c4c60f83f747e1 | |
parent | 7ae5fb7ec61f7215b3d609f656403b432ca20028 (diff) | |
download | NetworkManager-c834a8e822a4201c3d18c4c28b2305b292c70f1e.tar.gz |
tests: don't return path name from obj.get_managed_ifaces() in test-networkmanager-service.py
-rwxr-xr-x | tools/test-networkmanager-service.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index fd3c44a0ff..cb045c13a1 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -199,7 +199,7 @@ class ExportedObj(dbus.service.Object): my_ifaces = {} for iface in self._dbus_ifaces: my_ifaces[iface] = self._dbus_ifaces[iface].props - return self.path, my_ifaces + return my_ifaces ############################################################################### @@ -1342,14 +1342,12 @@ class ObjectManager(dbus.service.Object): self.objs = [] def add_object(self, obj): - name, ifaces = obj.get_managed_ifaces() self.objs.append(obj) - self.InterfacesAdded(name, ifaces) + self.InterfacesAdded(obj.path, obj.get_managed_ifaces()) def remove_object(self, obj): - name, ifaces = obj.get_managed_ifaces() self.objs.remove(obj) - self.InterfacesRemoved(name, ifaces.keys()) + self.InterfacesRemoved(obj.path, obj.get_managed_ifaces().keys()) @dbus.service.signal(IFACE_OBJECT_MANAGER, signature='oa{sa{sv}}') def InterfacesAdded(self, name, ifaces): @@ -1365,8 +1363,7 @@ class ObjectManager(dbus.service.Object): def GetManagedObjects(self, sender=None): managed_objects = {} for obj in self.objs: - name, ifaces = obj.get_managed_ifaces() - managed_objects[name] = ifaces + managed_objects[obj.path] = obj.get_managed_ifaces() return managed_objects ############################################################################### |