summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoão Paulo Rechi Vita <jprvita@openbossa.org>2013-03-20 17:17:06 -0300
committerJoão Paulo Rechi Vita <jprvita@gmail.com>2014-01-16 10:41:11 -0300
commitf959636dc4d8942e0e6d122a306723139d87338f (patch)
tree3404c4112e0ad458b4c96cb0f734b9c83a953c36
parent38fc090f24332ee87ed916a35dd47fd4511874ab (diff)
test: Fix list-devices when there is more than one adapterfixes
-rwxr-xr-xtest/list-devices5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/list-devices b/test/list-devices
index 0aac217d1..790b35870 100755
--- a/test/list-devices
+++ b/test/list-devices
@@ -31,9 +31,6 @@ def extract_uuids(uuid_list):
objects = manager.GetManagedObjects()
-all_devices = (str(path) for path, interfaces in objects.iteritems() if
- "org.bluez.Device1" in interfaces.keys())
-
for path, interfaces in objects.iteritems():
if "org.bluez.Adapter1" not in interfaces.keys():
continue
@@ -49,6 +46,8 @@ for path, interfaces in objects.iteritems():
else:
print(" %s = %s" % (key, value))
+ all_devices = (str(path) for path, interfaces in objects.iteritems() if
+ "org.bluez.Device1" in interfaces.keys())
device_list = [d for d in all_devices if d.startswith(path + "/")]
for dev_path in device_list: