summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/twisted/jingle/call-dtmf.py65
1 files changed, 33 insertions, 32 deletions
diff --git a/tests/twisted/jingle/call-dtmf.py b/tests/twisted/jingle/call-dtmf.py
index 6478a36ba..418080545 100644
--- a/tests/twisted/jingle/call-dtmf.py
+++ b/tests/twisted/jingle/call-dtmf.py
@@ -23,9 +23,8 @@ class CallDtmfTest(CallTest):
call_async(q, content.DTMF, 'StartTone', 3)
q.expect_many(
- EventPattern('dbus-signal', signal='SendingTones', args=['3']),
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_SEND, 3]),
+ args = [3, cs.CALL_SENDING_STATE_PENDING_SEND]),
EventPattern('dbus-return', method='StartTone'),
)
@@ -34,18 +33,20 @@ class CallDtmfTest(CallTest):
dbus_interface=dbus.PROPERTIES_IFACE));
content.Media.AcknowledgeDTMFChange(3, cs.CALL_SENDING_STATE_SENDING)
+
+ q.expect('dbus-signal', signal='SendingTones', args=['3'])
call_async(q, content.DTMF, 'StopTone')
q.expect_many(
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_STOP_SENDING, 3]),
+ args = [3, cs.CALL_SENDING_STATE_PENDING_STOP_SENDING]),
EventPattern('dbus-return', method='StopTone'),
)
call_async(q, content.Media, 'AcknowledgeDTMFChange', 3,
cs.CALL_SENDING_STATE_NONE)
q.expect_many(
- EventPattern('dbus-signal', signal='StoppedTones', args=[True]),
+ EventPattern('dbus-signal', signal='StoppedTones', args=[False]),
EventPattern('dbus-return', method='AcknowledgeDTMFChange'),
)
@@ -55,35 +56,37 @@ class CallDtmfTest(CallTest):
call_async(q, content.DTMF, 'MultipleTones', '123')
q.expect_many(
- EventPattern('dbus-signal', signal='SendingTones', args=['123']),
EventPattern('dbus-return', method='MultipleTones'),
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_SEND, 1]),
+ args = [1, cs.CALL_SENDING_STATE_PENDING_SEND]),
)
content.Media.AcknowledgeDTMFChange(1, cs.CALL_SENDING_STATE_SENDING)
+
+ q.expect('dbus-signal', signal='SendingTones', args=['123'])
q.expect('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_STOP_SENDING, 1])
+ args = [1, cs.CALL_SENDING_STATE_PENDING_STOP_SENDING])
content.Media.AcknowledgeDTMFChange(1, cs.CALL_SENDING_STATE_NONE)
q.expect_many(
- EventPattern('dbus-signal', signal='SendingTones', args=['23']),
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_SEND, 2]),
+ args = [2, cs.CALL_SENDING_STATE_PENDING_SEND]),
)
content.Media.AcknowledgeDTMFChange(2, cs.CALL_SENDING_STATE_SENDING)
+ q.expect('dbus-signal', signal='SendingTones', args=['23']),
+
q.expect('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_STOP_SENDING, 2])
+ args = [2, cs.CALL_SENDING_STATE_PENDING_STOP_SENDING])
content.Media.AcknowledgeDTMFChange(2, cs.CALL_SENDING_STATE_NONE)
q.expect_many(
- EventPattern('dbus-signal', signal='SendingTones', args=['3']),
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_SEND, 3]),
+ args = [3, cs.CALL_SENDING_STATE_PENDING_SEND]),
)
content.Media.AcknowledgeDTMFChange(3, cs.CALL_SENDING_STATE_SENDING)
+ q.expect('dbus-signal', signal='SendingTones', args=['3']),
q.expect('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_STOP_SENDING, 3])
+ args = [3, cs.CALL_SENDING_STATE_PENDING_STOP_SENDING])
content.Media.AcknowledgeDTMFChange(3, cs.CALL_SENDING_STATE_NONE)
q.expect_many(
@@ -93,9 +96,8 @@ class CallDtmfTest(CallTest):
call_async(q, content.DTMF, 'MultipleTones',
'1,1' * 100)
q.expect_many(
- EventPattern('dbus-signal', signal='SendingTones'),
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_SEND, 1]),
+ args = [1, cs.CALL_SENDING_STATE_PENDING_SEND]),
EventPattern('dbus-return', method='MultipleTones'),
)
call_async(q, content.DTMF, 'MultipleTones', '9')
@@ -107,7 +109,7 @@ class CallDtmfTest(CallTest):
call_async(q, content.DTMF, 'StopTone')
q.expect_many(
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_STOP_SENDING, 1]),
+ args = [1, cs.CALL_SENDING_STATE_PENDING_STOP_SENDING]),
EventPattern('dbus-return', method='StopTone'),
)
call_async(q, content.Media, 'AcknowledgeDTMFChange',
@@ -119,16 +121,17 @@ class CallDtmfTest(CallTest):
call_async(q, content.DTMF, 'MultipleTones', '1w2')
q.expect_many(
- EventPattern('dbus-signal', signal='SendingTones', args=['1w2']),
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_SEND, 1]),
+ args = [1, cs.CALL_SENDING_STATE_PENDING_SEND]),
EventPattern('dbus-return', method='MultipleTones'),
)
content.Media.AcknowledgeDTMFChange(1, cs.CALL_SENDING_STATE_SENDING)
+
+ q.expect('dbus-signal', signal='SendingTones', args=['1w2']),
q.expect('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_STOP_SENDING, 1])
+ args = [1, cs.CALL_SENDING_STATE_PENDING_STOP_SENDING])
call_async(q, content.Media, 'AcknowledgeDTMFChange', 1,
cs.CALL_SENDING_STATE_NONE)
@@ -142,9 +145,8 @@ class CallDtmfTest(CallTest):
call_async(q, content.DTMF, 'StartTone', 7)
q.expect_many(
- EventPattern('dbus-signal', signal='SendingTones', args=['7']),
EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_SEND, 7]),
+ args = [7, cs.CALL_SENDING_STATE_PENDING_SEND]),
EventPattern('dbus-return', method='StartTone'),
)
@@ -152,20 +154,19 @@ class CallDtmfTest(CallTest):
assertEquals('', content.Get(cs.CALL_CONTENT_IFACE_DTMF,
'DeferredTones', dbus_interface=dbus.PROPERTIES_IFACE));
- content.Media.AcknowledgeDTMFChange(6, cs.CALL_SENDING_STATE_SENDING)
+ content.Media.AcknowledgeDTMFChange(7, cs.CALL_SENDING_STATE_SENDING)
+
+ q.expect('dbus-signal', signal='SendingTones', args=['7']),
call_async(q, content.DTMF, 'StopTone')
q.expect_many(
- EventPattern('dbus-signal', signal='DTMFChangeRequested',
- args = [cs.CALL_SENDING_STATE_PENDING_STOP_SENDING, 1]),
- EventPattern('dbus-return', method='StopTone'),
- )
- call_async(q, content.Media, 'AcknowledgeDTMFChange',
- 1, cs.CALL_SENDING_STATE_NONE)
- q.expect_many(
- EventPattern('dbus-signal', signal='StoppedTones', args=[True]),
- EventPattern('dbus-return', method='AcknowledgeDTMFChange'),
- )
+ EventPattern('dbus-signal', signal='DTMFChangeRequested',
+ args = [7, cs.CALL_SENDING_STATE_PENDING_STOP_SENDING]),
+ EventPattern('dbus-return', method='StopTone'),
+ )
+
+ content.Media.AcknowledgeDTMFChange(7, cs.CALL_SENDING_STATE_NONE)
+ q.expect('dbus-signal', signal='StoppedTones', args=[False])
def pickup(self):
View Lorry Controller Status