Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez

3 files changed, 48 insertions, 5 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index ba2bdc65..6f317c9d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -41,7 +41,7 @@ INCLUDES = -I$(top_srcdir)/common
 
 EXTRA_DIST = apitest hsplay hsmicro bdaddr.8 dbusdef.py \
 	list-devices test-discovery test-manager test-adapter test-device \
-	simple-service simple-agent service-record.dtd \
+	test-serial simple-service simple-agent service-record.dtd \
 	service-did.xml service-spp.xml service-opp.xml service-ftp.xml
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/test/simple-service b/test/simple-service
index 5279a3a6..d03ec3db 100755
--- a/test/simple-service
+++ b/test/simple-service
@@ -109,10 +109,10 @@ if len(sys.argv) > 1:
 else:
 	path = manager.DefaultAdapter()
 
-adapter = dbus.Interface(bus.get_object("org.bluez", path),
-						"org.bluez.Adapter")
+service = dbus.Interface(bus.get_object("org.bluez", path),
+						"org.bluez.Service")
 
-handle = adapter.AddServiceRecord(xml)
+handle = service.AddRecord(xml)
 
 print "Service record with handle 0x%04x added" % (handle)
 
@@ -124,4 +124,4 @@ try:
 except:
 	pass
 
-adapter.RemoveServiceRecord(dbus.UInt32(handle))
+service.RemoveRecord(dbus.UInt32(handle))
diff --git a/test/test-serial b/test/test-serial
new file mode 100755
index 00000000..73561cc1
--- /dev/null
+++ b/test/test-serial
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+import sys
+import time
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+
+adapter = dbus.Interface(bus.get_object("org.bluez", manager.DefaultAdapter()),
+							"org.bluez.Adapter")
+
+if (len(sys.argv) < 2):
+	print "Usage: %s <address> [service]" % (sys.argv[0])
+	sys.exit(1)
+
+address = sys.argv[1]
+
+if (len(sys.argv) < 3):
+	service = "spp"
+else:
+	service = sys.argv[2]
+
+path = adapter.FindDevice(address)
+
+serial = dbus.Interface(bus.get_object("org.bluez", path),
+						"org.bluez.Serial")
+
+node = serial.Connect(service)
+
+print "Connected %s to %s" % (device, address)
+
+print "Press CTRL-C to disconnect"
+
+try:
+	time.sleep(1000)
+	print "Terminating connection"
+except:
+	pass
+
+serial.Disconnect(node)