summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-01 20:35:32 -0500
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-01 20:35:32 -0500
commit8a1da6094f792ba54f4ea001f4accbf6e91e6a71 (patch)
tree7126625a2d2a415e41ade67112421277311d39f0
parent06c35847ab427319ed9668faf55ea1926bbd2d91 (diff)
Add test for receiving failure.. and make it work
-rw-r--r--rakia/call-stream.c4
-rw-r--r--tests/twisted/voip/direction-change.py35
2 files changed, 36 insertions, 3 deletions
diff --git a/rakia/call-stream.c b/rakia/call-stream.c
index 7f3d9fe..5cd79c3 100644
--- a/rakia/call-stream.c
+++ b/rakia/call-stream.c
@@ -314,10 +314,10 @@ rakia_call_stream_report_receiving_failure (TpBaseMediaCallStream *bmcs,
if (!(current_requested_direction & RAKIA_DIRECTION_RECEIVE))
return;
- if (!(current_direction & RAKIA_DIRECTION_RECEIVE))
+ if (current_direction & RAKIA_DIRECTION_RECEIVE)
tp_base_call_stream_update_remote_sending_state (bcs,
tp_base_channel_get_target_handle (bchan),
- TP_SENDING_STATE_NONE,
+ TP_SENDING_STATE_PENDING_STOP_SENDING,
tp_base_channel_get_self_handle (bchan),
reason, dbus_reason, message);
diff --git a/tests/twisted/voip/direction-change.py b/tests/twisted/voip/direction-change.py
index c07d1c2..b63e26f 100644
--- a/tests/twisted/voip/direction-change.py
+++ b/tests/twisted/voip/direction-change.py
@@ -511,7 +511,8 @@ class DirectionChange(calltest.CallTest):
args=[cs.CALL_STREAM_FLOW_STATE_STOPPED],
path=content.stream.__dbus_object_path__),
EventPattern('dbus-signal', signal='LocalSendingStateChanged',
- path=content.stream.__dbus_object_path__),
+ path=content.stream.__dbus_object_path__,
+ predicate=lambda e: e.args[0] == 0),
EventPattern('sip-invite'))
assertEquals(cs.CALL_SENDING_STATE_NONE, o[1].args[0])
@@ -531,6 +532,37 @@ class DirectionChange(calltest.CallTest):
self.start_sending(content)
+ def receiving_failed(self, content):
+
+ self.receiving = False
+
+ content.stream.Media.ReportReceivingFailure(
+ cs.CALL_SCR_MEDIA_ERROR, "", "receiving error")
+
+ o = self.q.expect_many(
+ EventPattern('dbus-signal', signal='ReceivingStateChanged',
+ args=[cs.CALL_STREAM_FLOW_STATE_STOPPED],
+ path=content.stream.__dbus_object_path__),
+ EventPattern('dbus-signal', signal='RemoteMembersChanged',
+ path=content.stream.__dbus_object_path__,
+ predicate=lambda e: e.args[0] == {self.remote_handle: cs.CALL_SENDING_STATE_PENDING_STOP_SENDING}),
+ EventPattern('sip-invite'))
+
+ reinvite_event = o[2]
+
+ assertContains('a=sendonly', reinvite_event.sip_message.body)
+ self.context.check_call_sdp(reinvite_event.sip_message.body)
+ body = reinvite_event.sip_message.body.replace(
+ 'sendonly', self.receiving and 'recvonly' or 'inactive')
+
+ self.context.accept(reinvite_event.sip_message, body)
+
+ ack_cseq = "%s ACK" % reinvite_event.cseq.split()[0]
+ self.q.expect('sip-ack', cseq=ack_cseq)
+
+ self.start_receiving(content)
+
+
def during_call(self):
content = self.contents[0]
@@ -548,6 +580,7 @@ class DirectionChange(calltest.CallTest):
self.reject_start_receiving(content)
self.sending_failed(content)
+ self.receiving_failed(content)
direction_change_event = [
EventPattern('dbus-signal', signal='LocalSendingStateChanged'),