Re: [PATCH] test: add set-call-forwarding

[Denis Kenzior <denkenz@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3582 bytes --]

Hi Jarko,

On 01/10/2011 03:26 AM, Jarko Poutiainen wrote:
> ---
>  Makefile.am              |    3 +-
>  test/set-call-forwarding |   65
> ++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 67 insertions(+), 1 deletions(-)
>  create mode 100755 test/set-call-forwarding
> 

This patch does not apply cleanly:

Applying: test: add set-call-forwarding
/home/denkenz/ofono-master/.git/rebase-apply/patch:39: trailing whitespace.
        print "CallForwarding property %s changed to %s" % (property,
fatal: corrupt patch at line 40
Patch failed at 0001 test: add set-call-forwarding
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

> diff --git a/Makefile.am b/Makefile.am
> index 8ad01cd..563da9f 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -440,7 +440,8 @@ test_scripts = test/backtrace \
>          test/set-tty \
>          test/set-gsm-band \
>          test/set-umts-band \
> -        test/lockdown-modem
> +        test/lockdown-modem \
> +        test/set-call-forwarding
> 
>  if TEST
>  testdir = $(pkglibdir)/test
> diff --git a/test/set-call-forwarding b/test/set-call-forwarding
> new file mode 100755
> index 0000000..03bf542
> --- /dev/null
> +++ b/test/set-call-forwarding
> @@ -0,0 +1,65 @@
> +#!/usr/bin/python
> +
> +import sys
> +import gobject
> +
> +import dbus
> +import dbus.mainloop.glib
> +
> +def property_changed(property, value):
> +

Can you please get rid of this empty line?

> +    if len(value.__str__()) > 0:
> +        print "CallForwarding property %s changed to %s" % (property,
> value)
> +    else:
> +        print "CallForwarding property %s changed to disabled" %
> (property)
> +

Please don't go over 80 characters / line.  This makes this script hard
to read.

> +    if canexit:
> +        mainloop.quit();
> +
> +if __name__ == "__main__":
> +

Please remove this empty line

> +    if len(sys.argv) < 3:
> +        print "Usage: %s <property> <value>" % (sys.argv[0])
> +        print "Properties can be: VoiceUnconditional, VoiceBusy,"
> +        print "    VoiceNoReply, VoiceNoReplyTimeout, VoiceNotReachable"
> +        print "Value: number to or the timeout"
> +        sys.exit(1)
> +
> +    property = sys.argv[1]
> +    value = sys.argv[2]
> +
> +    canexit = False
> +
> +    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
> +
> +    bus = dbus.SystemBus()
> +
> +    manager = dbus.Interface(bus.get_object('org.ofono', '/'),
> +                            'org.ofono.Manager')
> +
> +    modems = manager.GetModems()
> +
> +    cf = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
> +                'org.ofono.CallForwarding')
> +
> +    cf.connect_to_signal("PropertyChanged", property_changed)
> +
> +    if (property == "VoiceNoReplyTimeout"):
> +        try:
> +            cf.SetProperty(property, dbus.UInt16(value), timeout = 100)
> +        except dbus.DBusException, e:
> +            print "Unable SetProperty", e
> +            sys.exit(1);
> +    else:
> +        try:
> +            cf.SetProperty(property, value, timeout = 100)
> +        except dbus.DBusException, e:
> +            print "Unable SetProperty", e
> +            sys.exit(1);
> +
> +    print "Set Property successfull"
> +
> +    canexit = True
> +
> +    mainloop = gobject.MainLoop()
> +    mainloop.run()

Regards,
-Denis