diff options
author | Aki Niemi <aki.niemi@nokia.com> | 2010-04-16 22:42:27 +0300 |
---|---|---|
committer | Aki Niemi <aki.niemi@nokia.com> | 2010-04-20 14:16:33 +0300 |
commit | 1e75518c30861a39be8f47295f413590583ff3f3 (patch) | |
tree | 0a9f7b1ccc42b7678d4f79a6aba07d0b3406d355 | |
parent | 144b30ac6d0f2267d0ddc7fea49a72f0d7b107a2 (diff) | |
download | ofono-1e75518c30861a39be8f47295f413590583ff3f3.tar.bz2 |
Improve GPRS test scripts
Catch some errors and add a script for removing contexts.
-rwxr-xr-x | test/activate-context | 6 | ||||
-rwxr-xr-x | test/create-context | 6 | ||||
-rwxr-xr-x | test/deactivate-context | 6 | ||||
-rwxr-xr-x | test/remove-contexts | 28 |
4 files changed, 43 insertions, 3 deletions
diff --git a/test/activate-context b/test/activate-context index 7ee60e54..98c177a6 100755 --- a/test/activate-context +++ b/test/activate-context @@ -35,4 +35,8 @@ for path in properties["Modems"]: context = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.PrimaryDataContext') - context.SetProperty("Active", dbus.Boolean(1)) + try: + context.SetProperty("Active", dbus.Boolean(1)) + except dbus.DBusException, e: + print "Error activating %s: %s" % (path, str(e)) + exit(2) diff --git a/test/create-context b/test/create-context index 08f29600..46b9d620 100755 --- a/test/create-context +++ b/test/create-context @@ -32,6 +32,10 @@ for path in properties["Modems"]: context = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.PrimaryDataContext') - context.SetProperty("AccessPointName", sys.argv[1]) + try: + context.SetProperty("AccessPointName", sys.argv[1]) + except IndexError: + print "Usage: %s <apn_name>" % sys.argv[0] + exit(1) print "Setting APN of %s to %s" % (path, sys.argv[1]) diff --git a/test/deactivate-context b/test/deactivate-context index 2e119219..23d2c0c5 100755 --- a/test/deactivate-context +++ b/test/deactivate-context @@ -33,4 +33,8 @@ for path in properties["Modems"]: context = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.PrimaryDataContext') - context.SetProperty("Active", dbus.Boolean(0)) + try: + context.SetProperty("Active", dbus.Boolean(0)) + except dbus.DBusException, e: + print "Error activating %s: %s" % (path, str(e)) + exit(2) diff --git a/test/remove-contexts b/test/remove-contexts new file mode 100755 index 00000000..181c6fcd --- /dev/null +++ b/test/remove-contexts @@ -0,0 +1,28 @@ +#!/usr/bin/python + +import dbus + +bus = dbus.SystemBus() + +manager = dbus.Interface(bus.get_object('org.ofono', '/'), + 'org.ofono.Manager') + +properties = manager.GetProperties() + +for path in properties["Modems"]: + modem = dbus.Interface(bus.get_object('org.ofono', path), + 'org.ofono.Modem') + + properties = modem.GetProperties() + + if "org.ofono.DataConnectionManager" not in properties["Interfaces"]: + continue + + connmgr = dbus.Interface(bus.get_object('org.ofono', path), + 'org.ofono.DataConnectionManager') + + properties = connmgr.GetProperties() + + for path in properties["PrimaryContexts"]: + connmgr.RemoveContext(path) + print"Removed: [ %s ]" % (path) |