From f89882a84a048cd676798e4a047a73fb202e246d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 3 Apr 2007 20:48:42 +0000 Subject: Update test setup --- test/dbusdef.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index 62203993..97a0eb4d 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -7,15 +7,24 @@ dummy = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.freedeskt #print dummy.Introspect() + manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager') database = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Database') -adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') -test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test') +try: + adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') + + test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test') + + rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM') +except: + adapter = "" + + test = "" -rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM') + rfcomm = "" def create_service(identifier): @@ -40,11 +49,11 @@ audio = create_service("audio") headset = create_service("headset") -def connect_transfer(): +def connect_headset(): try: - conn = manager.ActivateService("transfer") + conn = manager.ActivateService("headset") except: conn = "" if (conn != ""): - return dbus.Interface(bus.get_object(conn, "/org/bluez/transfer"), 'org.bluez.transfer.Manager') + return dbus.Interface(bus.get_object(conn, "/org/bluez/audio"), 'org.bluez.audio.Manager') -- cgit