From 90e7850d95b36c6c2e7a0fffe848b8b48557b6f3 Mon Sep 17 00:00:00 2001 From: Mikel Astiz Date: Wed, 5 Dec 2012 13:51:30 +0100 Subject: test: Avoid using DefaultAdapter() Call the utility library -which uses ObjectManager API- to avoid using Manager.FindAdapter() and Manager.DefaultAdapter(). --- test/test-thermometer | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'test/test-thermometer') diff --git a/test/test-thermometer b/test/test-thermometer index e14a3450a..5a884a385 100755 --- a/test/test-thermometer +++ b/test/test-thermometer @@ -13,6 +13,7 @@ import dbus import dbus.service import dbus.mainloop.glib from optparse import OptionParser, make_option +import bluezutils class Watcher(dbus.service.Object): @dbus.service.method("org.bluez.ThermometerWatcher", @@ -40,9 +41,6 @@ if __name__ == "__main__": bus = dbus.SystemBus() - manager = dbus.Interface(bus.get_object("org.bluez", "/"), - "org.bluez.Manager") - option_list = [ make_option("-i", "--adapter", action="store", type="string", dest="adapter"), @@ -60,14 +58,8 @@ if __name__ == "__main__": print("\tEnableIntermediateMeasurement") sys.exit(1) - if options.adapter: - adapter_path = manager.FindAdapter(options.adapter) - else: - adapter_path = manager.DefaultAdapter() - - adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path), - "org.bluez.Adapter") - + adapter = bluezutils.find_adapter(options.adapter) + adapter_path = adapter.object_path thermometer_manager = dbus.Interface(bus.get_object("org.bluez", adapter_path), "org.bluez.ThermometerManager") -- cgit v1.2.1