projects
/
platform
/
upstream
/
ofono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c94c4fa
)
test: Make sure test-stk-menu works with python3
author
Denis Kenzior
<denkenz@gmail.com>
Fri, 14 Mar 2014 15:32:06 +0000
(10:32 -0500)
committer
Denis Kenzior
<denkenz@gmail.com>
Fri, 14 Mar 2014 15:32:06 +0000
(10:32 -0500)
test/test-stk-menu
patch
|
blob
|
history
diff --git
a/test/test-stk-menu
b/test/test-stk-menu
index
9ef92a1
..
0cf8fa2
100755
(executable)
--- a/
test/test-stk-menu
+++ b/
test/test-stk-menu
@@
-50,10
+50,11
@@
class StkAgent(dbus.service.Object):
in_signature="sya(sy)n", out_signature="y")
def RequestSelection(self, title, icon, items, default):
print("Title: (%s)" % (title))
in_signature="sya(sy)n", out_signature="y")
def RequestSelection(self, title, icon, items, default):
print("Title: (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
index = 0
for item in items:
index = 0
for item in items:
- print("%d. %s (icon: %d)" % (index, item[0], item[1]))
+ print("%d. %s (icon: %d)" %
+ (index, item[0], int(item[1])))
index += 1
print("\nDefault: %d" % (default))
index += 1
print("\nDefault: %d" % (default))
@@
-72,7
+73,7
@@
class StkAgent(dbus.service.Object):
"error_func"))
def DisplayText(self, title, icon, urgent, reply_func, error_func):
print("DisplayText (%s)" % (title))
"error_func"))
def DisplayText(self, title, icon, urgent, reply_func, error_func):
print("DisplayText (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
print("Urgent: (%d)" % (urgent))
key = input("Press return to clear ('t' terminates, "
"'b' goes back, 'n' busy, "
print("Urgent: (%d)" % (urgent))
key = input("Press return to clear ('t' terminates, "
"'b' goes back, 'n' busy, "
@@
-102,7
+103,7
@@
class StkAgent(dbus.service.Object):
def RequestInput(self, title, icon, default, min_chars, max_chars,
hide_typing):
print("Title: (%s)" % (title))
def RequestInput(self, title, icon, default, min_chars, max_chars,
hide_typing):
print("Title: (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
print("Default: (%s)" % (default))
print("Hide typing: (%s)" % (hide_typing))
print("Enter characters, min: %d, max: %d:" % (min_chars,
print("Default: (%s)" % (default))
print("Hide typing: (%s)" % (hide_typing))
print("Enter characters, min: %d, max: %d:" % (min_chars,
@@
-116,7
+117,7
@@
class StkAgent(dbus.service.Object):
def RequestDigits(self, title, icon, default, min_chars, max_chars,
hide_typing):
print("Title: (%s)" % (title))
def RequestDigits(self, title, icon, default, min_chars, max_chars,
hide_typing):
print("Title: (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
print("Default: (%s)" % (default))
print("Hide typing: (%s)" % (hide_typing))
print("Enter digits, min: %d, max: %d:" % (min_chars,
print("Default: (%s)" % (default))
print("Hide typing: (%s)" % (hide_typing))
print("Enter digits, min: %d, max: %d:" % (min_chars,
@@
-134,7
+135,7
@@
class StkAgent(dbus.service.Object):
in_signature="sy", out_signature="s")
def RequestKey(self, title, icon):
print("Title: (%s)" % (title))
in_signature="sy", out_signature="s")
def RequestKey(self, title, icon):
print("Title: (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
key = input("Enter Key (t, b):")
if key == 'b':
key = input("Enter Key (t, b):")
if key == 'b':
@@
-148,7
+149,7
@@
class StkAgent(dbus.service.Object):
in_signature="sy", out_signature="s")
def RequestDigit(self, title, icon):
print("Title: (%s)" % (title))
in_signature="sy", out_signature="s")
def RequestDigit(self, title, icon):
print("Title: (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
key = input("Enter Digit (t, b):")
if key == 'b':
key = input("Enter Digit (t, b):")
if key == 'b':
@@
-162,7
+163,7
@@
class StkAgent(dbus.service.Object):
in_signature="sy", out_signature="s")
def RequestQuickDigit(self, title, icon):
print("Title: (%s)" % (title))
in_signature="sy", out_signature="s")
def RequestQuickDigit(self, title, icon):
print("Title: (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
key = input("Quick digit (0-9, *, #, t, b):")
if key == 'b':
key = input("Quick digit (0-9, *, #, t, b):")
if key == 'b':
@@
-176,7
+177,7
@@
class StkAgent(dbus.service.Object):
in_signature="sy", out_signature="b")
def RequestConfirmation(self, title, icon):
print("Title: (%s)" % (title))
in_signature="sy", out_signature="b")
def RequestConfirmation(self, title, icon):
print("Title: (%s)" % (title))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
key = input("Enter Confirmation (t, b, y, n):")
if key == 'b':
key = input("Enter Confirmation (t, b, y, n):")
if key == 'b':
@@
-192,7
+193,7
@@
class StkAgent(dbus.service.Object):
in_signature="sy", out_signature="b")
def ConfirmCallSetup(self, info, icon):
print("Information: (%s)" % (info))
in_signature="sy", out_signature="b")
def ConfirmCallSetup(self, info, icon):
print("Information: (%s)" % (info))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
key = input("Enter Confirmation (t, y, n):")
if key == 't':
key = input("Enter Confirmation (t, y, n):")
if key == 't':
@@
-206,7
+207,7
@@
class StkAgent(dbus.service.Object):
in_signature="sys", out_signature="b")
def ConfirmLaunchBrowser(self, info, icon, url):
print("Information: (%s)" % (info))
in_signature="sys", out_signature="b")
def ConfirmLaunchBrowser(self, info, icon, url):
print("Information: (%s)" % (info))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
print("URL (%s)" % (url))
key = input("Enter Confirmation (y, n):")
print("URL (%s)" % (url))
key = input("Enter Confirmation (y, n):")
@@
-225,7
+226,7
@@
class StkAgent(dbus.service.Object):
def PlayTone(self, tone, text, icon):
print("PlayTone: %s" % (tone))
print("Text: %s" % (text))
def PlayTone(self, tone, text, icon):
print("PlayTone: %s" % (tone))
print("Text: %s" % (text))
- print("Icon: %d" % (i
con
))
+ print("Icon: %d" % (i
nt(icon)
))
signal.signal(signal.SIGALRM, handler)
signal.alarm(5)
signal.signal(signal.SIGALRM, handler)
signal.alarm(5)
@@
-248,7
+249,7
@@
class StkAgent(dbus.service.Object):
def LoopTone(self, tone, text, icon, reply_func, error_func):
print("LoopTone: %s" % (tone))
print("Text: %s" % (text))
def LoopTone(self, tone, text, icon, reply_func, error_func):
print("LoopTone: %s" % (tone))
print("Text: %s" % (text))
- print("Icon: %d" % (i
con
))
+ print("Icon: %d" % (i
nt(icon)
))
key = input("Press return to end before timeout "
"('t' terminates, 'w' return and wait):")
key = input("Press return to end before timeout "
"('t' terminates, 'w' return and wait):")
@@
-271,13
+272,13
@@
class StkAgent(dbus.service.Object):
in_signature="sy", out_signature="")
def DisplayActionInformation(self, text, icon):
print("Text: %s" % (text))
in_signature="sy", out_signature="")
def DisplayActionInformation(self, text, icon):
print("Text: %s" % (text))
- print("Icon: %d" % (i
con
))
+ print("Icon: %d" % (i
nt(icon)
))
@dbus.service.method("org.ofono.SimToolkitAgent",
in_signature="sy", out_signature="")
def DisplayAction(self, text, icon):
print("Text: (%s)" % (text))
@dbus.service.method("org.ofono.SimToolkitAgent",
in_signature="sy", out_signature="")
def DisplayAction(self, text, icon):
print("Text: (%s)" % (text))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
key = input("Press 't' to terminate the session ")
if key == 't':
key = input("Press 't' to terminate the session ")
if key == 't':
@@
-287,7
+288,7
@@
class StkAgent(dbus.service.Object):
in_signature="sy", out_signature="b")
def ConfirmOpenChannel(self, info, icon):
print("Open channel confirmation: (%s)" % (info))
in_signature="sy", out_signature="b")
def ConfirmOpenChannel(self, info, icon):
print("Open channel confirmation: (%s)" % (info))
- print("Icon: (%d)" % (i
con
))
+ print("Icon: (%d)" % (i
nt(icon)
))
key = input("Enter Confirmation (t, y, n):")
if key == 't':
key = input("Enter Confirmation (t, y, n):")
if key == 't':