wifi: Use common scan callback handling

[framework/connectivity/connman.git] / test / test-session

diff --git a/test/test-session b/test/test-session
index 7613b10..2d82fb6 100755 (executable)
--- a/test/test-session
+++ b/test/test-session
@@ -43,7 +43,7 @@ class Notification(dbus.service.Object):
        def Release(self):
                print "Release %s" % (self._object_path)
                session_name = self._object_path.split('/')[-1]
-               self.app.release(sessioin_name)
+               self.app.release(session_name)
 
        @dbus.service.method("net.connman.Notification",
                                in_signature='a{sv}', out_signature='')
@@ -76,7 +76,6 @@ class SessionApplication(dbus.service.Object):
                        bus.watch_name_owner('net.connman', self.connman_name_owner_changed)
                except dbus.DBusException:
                        traceback.print_exc()
-                       exit(1)
 
        def connman_name_owner_changed(self, proxy):
                try:
@@ -97,7 +96,6 @@ class SessionApplication(dbus.service.Object):
 
                except dbus.DBusException:
                        traceback.print_exc()
-                       exit(1)
 
        def release(self, session_name):
                s = self.find_session(session_name)
@@ -112,8 +110,11 @@ class SessionApplication(dbus.service.Object):
                del self.sessions[session_name]
 
        def type_convert(self, key, value):
-               if key in [ "AllowedBearers", "RoamingPolicy" ]:
+               if key in [ "AllowedBearers" ]:
                        return value
+               elif key in [ "RoamingPolicy", "ConnectionType" ]:
+                       if len(value) > 0:
+                               return value[0]
                elif key in [ "Priority", "AvoidHandover",
                              "StayConnected", "EmergencyCall" ]:
                        flag = str(value[0]).strip().lower()
@@ -162,7 +163,6 @@ class SessionApplication(dbus.service.Object):
                                print e.get_dbus_message()
                                return
                        traceback.print_exc()
-                       exit(1)
 
        @dbus.service.method("com.example.TestSession",
                                in_signature='', out_signature='')
@@ -178,7 +178,6 @@ class SessionApplication(dbus.service.Object):
                        self.release(session_name)
                except dbus.DBusException:
                        traceback.print_exc()
-                       exit(1)
 
        @dbus.service.method("com.example.TestSession",
                                in_signature='', out_signature='')
@@ -197,7 +196,6 @@ class SessionApplication(dbus.service.Object):
                                print e.get_dbus_message()
                                return
                        traceback.print_exc()
-                       exit(1)
 
        @dbus.service.method("com.example.TestSession",
                                in_signature='', out_signature='')
@@ -216,7 +214,6 @@ class SessionApplication(dbus.service.Object):
                                print e.get_dbus_message()
                                return
                        traceback.print_exc()
-                       exit(1)
 
        @dbus.service.method("com.example.TestSession",
                                in_signature='', out_signature='')
@@ -236,7 +233,6 @@ class SessionApplication(dbus.service.Object):
                                print e.get_dbus_message()
                                return
                        traceback.print_exc()
-                       exit(1)
 
        @dbus.service.method("com.example.TestSession",
                                in_signature='', out_signature='')