Merge commit 'origin/master' into states

1 files changed, 23 insertions, 3 deletions

diff --git a/test/mm-test.py b/test/mm-test.py
index 871ba202..cb9ecf0a 100755
--- a/test/mm-test.py
+++ b/test/mm-test.py
@@ -67,6 +67,12 @@ def cdma_inspect(proxy, dump_private):
         print "Error reading registration state: %s" % e
 
     try:
+        quality = cdma.GetSignalQuality()
+        print "Signal quality: %d" % quality
+    except dbus.exceptions.DBusException, e:
+        print "Error reading signal quality: %s" % e
+
+    try:
         info = cdma.GetServingSystem()
         print "Class: %s" % get_cdma_band_class(info[0])
         print "Band:  %s" % info[1]
@@ -170,10 +176,19 @@ def gsm_inspect(proxy, dump_private):
 
     # Gsm.Network interface
     net = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM_GSM_NETWORK)
-    print "Signal quality: %d" % net.GetSignalQuality()
+    try:
+        quality = net.GetSignalQuality()
+        print "Signal quality: %d" % quality
+    except dbus.exceptions.DBusException, e:
+        print "Error reading signal quality: %s" % e
 
     print "Scanning..."
-    results = net.Scan(timeout=120)
+    try:
+        results = net.Scan(timeout=120)
+    except dbus.exceptions.DBusException, e:
+        print "Error scanning: %s" % e
+        results = {}
+
     for r in results:
         status = r['status']
         if status == "1":
@@ -214,7 +229,12 @@ def gsm_connect(proxy, apn, user, password):
     # Modem.Simple interface
     simple = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM_SIMPLE)
     try:
-        simple.Connect({'apn': apn, 'number':"*99#"}, timeout=60)
+        opts = {'apn': apn, 'number':"*99#"}
+        if user is not None:
+            opts['username'] = user
+        if password is not None:
+            opts['password'] = password
+        simple.Connect(opts, timeout=120)
         print "\nConnected!"
     except Exception, e:
         print "Error connecting: %s" % e