diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-02-01 22:54:22 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-03-26 12:29:03 +0100 |
| commit | 4913e3fffba79279a09912e30ce0cda37558f272 (patch) | |
| tree | 2caad864c691b1b02c5ef4dedee1ea11a247eaa3 | |
| parent | 5901990f19545404aab850342e6a732a41579058 (diff) | |
| download | neard-4913e3fffba79279a09912e30ce0cda37558f272.tar.gz | |
test: Use neardutils.get_managed_objects() when possible
neardutils.get_managed_objects() is defined in neardutils.py
but never used.
It can perfectly fit at several places in test/test-adapter,
test/test-device, test/test-tag
| -rwxr-xr-x | test/test-adapter | 4 | ||||
| -rwxr-xr-x | test/test-device | 8 | ||||
| -rwxr-xr-x | test/test-tag | 8 |
3 files changed, 5 insertions, 15 deletions
diff --git a/test/test-adapter b/test/test-adapter index 70d5d6a..173519e 100755 --- a/test/test-adapter +++ b/test/test-adapter @@ -26,9 +26,7 @@ if (len(sys.argv) < 2): if (sys.argv[1] == "list"): if (len(sys.argv) < 3): - om = dbus.Interface(bus.get_object("org.neard", "/"), - "org.freedesktop.DBus.ObjectManager") - objects = om.GetManagedObjects() + objects = neardutils.get_managed_objects() for path, interfaces in objects.iteritems(): if "org.neard.Adapter" not in interfaces: continue diff --git a/test/test-device b/test/test-device index a4923fb..1c90ef1 100755 --- a/test/test-device +++ b/test/test-device @@ -41,9 +41,7 @@ if (len(sys.argv) < 2): if (sys.argv[1] == "list"): if (len(sys.argv) < 3): - om = dbus.Interface(bus.get_object("org.neard", "/"), - "org.freedesktop.DBus.ObjectManager") - objects = om.GetManagedObjects() + objects = neardutils.get_managed_objects() for path, interfaces in objects.iteritems(): if "org.neard.Device" not in interfaces: continue @@ -59,9 +57,7 @@ if (sys.argv[1] == "list"): if (sys.argv[1] == "dump"): if (len(sys.argv) < 3): - om = dbus.Interface(bus.get_object("org.neard", "/"), - "org.freedesktop.DBus.ObjectManager") - objects = om.GetManagedObjects() + objects = neardutils.get_managed_objects() for path, interfaces in objects.iteritems(): if "org.neard.Device" not in interfaces: continue diff --git a/test/test-tag b/test/test-tag index 3d2c226..9ccca8a 100755 --- a/test/test-tag +++ b/test/test-tag @@ -44,9 +44,7 @@ if (len(sys.argv) < 2): if (sys.argv[1] == "list"): if (len(sys.argv) < 3): - om = dbus.Interface(bus.get_object("org.neard", "/"), - "org.freedesktop.DBus.ObjectManager") - objects = om.GetManagedObjects() + objects = neardutils.get_managed_objects() for path, interfaces in objects.iteritems(): if "org.neard.Tag" not in interfaces: continue @@ -70,9 +68,7 @@ if (sys.argv[1] == "list"): if (sys.argv[1] == "dump"): if (len(sys.argv) < 3): - om = dbus.Interface(bus.get_object("org.neard", "/"), - "org.freedesktop.DBus.ObjectManager") - objects = om.GetManagedObjects() + objects = neardutils.get_managed_objects() for path, interfaces in objects.iteritems(): if "org.neard.Tag" not in interfaces: continue |