From eaf167bebdc24c992b0a7b130432064eb5c537b7 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 11 Dec 2009 12:53:50 -0800
Subject: [PATCH] test: argument parsing and connect improvements

---
 test/mm-test.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/mm-test.py b/test/mm-test.py
index e1d68b0f..0e82bc9d 100755
--- a/test/mm-test.py
+++ b/test/mm-test.py
@@ -230,7 +230,9 @@ def gsm_connect(proxy, apn, user, password):
     # Modem.Simple interface
     simple = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM_SIMPLE)
     try:
-        opts = {'apn': apn, 'number':"*99#"}
+        opts = {'number':"*99#"}
+        if apn is not None:
+            opts['apn'] = apn
         if user is not None:
             opts['username'] = user
         if password is not None:
@@ -252,7 +254,7 @@ while x < len(sys.argv):
         dump_private = True
     elif sys.argv[x] == "--connect":
         connect = True
-    elif sys.argv[x] == "--user":
+    elif (sys.argv[x] == "--user" or sys.argv[x] == "--username"):
         x += 1
         user = sys.argv[x]
     elif sys.argv[x] == "--apn":