telepathy-rakia: fixup! sync constants.py from Gabble master
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Tue Oct 1 08:41:30 PDT 2013
Module: telepathy-rakia
Branch: master
Commit: d5cfb524cb959a4928d8c267c3b29295f325a954
URL: http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=d5cfb524cb959a4928d8c267c3b29295f325a954
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Tue Oct 1 16:59:56 2013 +0200
fixup! sync constants.py from Gabble master
---
tests/twisted/voip/add-remove-content.py | 2 +-
tests/twisted/voip/calltest.py | 4 ++--
tests/twisted/voip/direction-change.py | 22 +++++++++++-----------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tests/twisted/voip/add-remove-content.py b/tests/twisted/voip/add-remove-content.py
index 21f9088..8e4dd63 100644
--- a/tests/twisted/voip/add-remove-content.py
+++ b/tests/twisted/voip/add-remove-content.py
@@ -134,7 +134,7 @@ class AddRemoveContent(calltest.CallTest):
path=self.chan.__dbus_object_path__))
assertEquals(content.__dbus_object_path__, content_removed.args[0])
assertEquals(self.self_handle, content_removed.args[1][0])
- assertEquals(cs.CALL_SCR_USER_REQUESTED, content_removed.args[1][1])
+ assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, content_removed.args[1][1])
self.medias[x] = (None, None)
diff --git a/tests/twisted/voip/calltest.py b/tests/twisted/voip/calltest.py
index aad5cd1..1cc3cc9 100644
--- a/tests/twisted/voip/calltest.py
+++ b/tests/twisted/voip/calltest.py
@@ -457,7 +457,7 @@ class CallTest:
assertEquals(0, o[0].args[1])
assertEquals(self.remote_handle, o[0].args[2][0])
else:
- self.chan.Call1.Hangup(cs.CALL_SCR_USER_REQUESTED, "",
+ self.chan.Call1.Hangup(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, "",
"User hangs up")
ended_event, bye_event = self.q.expect_many(
EventPattern('dbus-signal', signal='CallStateChanged'),
@@ -465,7 +465,7 @@ class CallTest:
# Check that we're the actor
assertEquals(cs.CALL_STATE_ENDED, ended_event.args[0])
assertEquals(0, ended_event.args[1])
- assertEquals((self.self_handle, cs.CALL_SCR_USER_REQUESTED, "",
+ assertEquals((self.self_handle, cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, "",
"User hangs up"), ended_event.args[2])
# For completeness, reply to the BYE.
diff --git a/tests/twisted/voip/direction-change.py b/tests/twisted/voip/direction-change.py
index cd69940..b77e440 100644
--- a/tests/twisted/voip/direction-change.py
+++ b/tests/twisted/voip/direction-change.py
@@ -155,7 +155,7 @@ class DirectionChange(calltest.CallTest):
assertEquals(cs.CALL_SENDING_STATE_PENDING_STOP_SENDING,
o[1].args[0][self.remote_handle])
assertEquals(self.self_handle, o[1].args[3][0])
- assertEquals(cs.CALL_SCR_USER_REQUESTED, o[1].args[3][1])
+ assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, o[1].args[3][1])
reinvite_event = o[2]
@@ -191,7 +191,7 @@ class DirectionChange(calltest.CallTest):
assertEquals(cs.CALL_SENDING_STATE_PENDING_SEND,
o.args[0][self.remote_handle])
assertEquals(self.self_handle, o.args[3][0])
- assertEquals(cs.CALL_SCR_USER_REQUESTED, o.args[3][1])
+ assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, o.args[3][1])
self.context.options_ping(self.q)
self.q.unforbid_events(invite_event)
@@ -244,7 +244,7 @@ class DirectionChange(calltest.CallTest):
assertEquals(cs.CALL_SENDING_STATE_PENDING_STOP_SENDING,
o[1].args[0][self.remote_handle])
assertEquals(self.self_handle, o[1].args[3][0])
- assertEquals(cs.CALL_SCR_USER_REQUESTED, o[1].args[3][1])
+ assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, o[1].args[3][1])
reinvite_event = o[2]
self.context.check_call_sdp(reinvite_event.sip_message.body,
@@ -265,7 +265,7 @@ class DirectionChange(calltest.CallTest):
assertEquals(cs.CALL_SENDING_STATE_NONE,
o[1].args[0][self.remote_handle])
#assertEquals(self.remote_handle, o[1].args[3][0])
- #assertEquals(cs.CALL_SCR_USER_REQUESTED, o[1].args[3][1])
+ #assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, o[1].args[3][1])
content.stream.Media.CompleteReceivingStateChange(
cs.CALL_STREAM_FLOW_STATE_STOPPED)
@@ -300,7 +300,7 @@ class DirectionChange(calltest.CallTest):
assertEquals(cs.CALL_SENDING_STATE_PENDING_SEND,
o[1].args[0][self.remote_handle])
assertEquals(self.self_handle, o[1].args[3][0])
- assertEquals(cs.CALL_SCR_USER_REQUESTED, o[1].args[3][1])
+ assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, o[1].args[3][1])
reinvite_event = o[2]
assertDoesNotContain('a=sendonly', reinvite_event.sip_message.body)
@@ -320,7 +320,7 @@ class DirectionChange(calltest.CallTest):
assertEquals(cs.CALL_SENDING_STATE_SENDING,
o[1].args[0][self.remote_handle])
#assertEquals(self.remote_handle, o[1].args[3][0])
- #assertEquals(cs.CALL_SCR_USER_REQUESTED, o[1].args[3][1])
+ #assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, o[1].args[3][1])
def stop_start_receiving_user_requested(self, content):
@@ -353,7 +353,7 @@ class DirectionChange(calltest.CallTest):
assertEquals(cs.CALL_SENDING_STATE_PENDING_SEND,
o[1].args[0][self.remote_handle])
assertEquals(self.self_handle, o[1].args[3][0])
- assertEquals(cs.CALL_SCR_USER_REQUESTED, o[1].args[3][1])
+ assertEquals(cs.CALL_STATE_CHANGE_REASON_USER_REQUESTED, o[1].args[3][1])
reinvite_event = o[2]
assertDoesNotContain('a=sendonly', reinvite_event.sip_message.body)
@@ -439,13 +439,13 @@ class DirectionChange(calltest.CallTest):
if receiving:
self.contents[0].stream.Media.ReportReceivingFailure(
- cs.CALL_SCR_MEDIA_ERROR, "", "")
+ cs.CALL_STATE_CHANGE_REASON_MEDIA_ERROR, "", "")
events = self.stream_dbus_signal_event(
'SendingStateChanged',
args=[cs.CALL_STREAM_FLOW_STATE_PENDING_STOP])
else:
self.contents[0].stream.Media.ReportSendingFailure(
- cs.CALL_SCR_MEDIA_ERROR, "", "")
+ cs.CALL_STATE_CHANGE_REASON_MEDIA_ERROR, "", "")
events = self.stream_dbus_signal_event(
'ReceivingStateChanged',
args=[cs.CALL_STREAM_FLOW_STATE_PENDING_STOP])
@@ -504,7 +504,7 @@ class DirectionChange(calltest.CallTest):
self.sending = False
content.stream.Media.ReportSendingFailure(
- cs.CALL_SCR_MEDIA_ERROR, "", "sending error")
+ cs.CALL_STATE_CHANGE_REASON_MEDIA_ERROR, "", "sending error")
o = self.q.expect_many(
EventPattern('dbus-signal', signal='SendingStateChanged',
@@ -540,7 +540,7 @@ class DirectionChange(calltest.CallTest):
'SendingState') == cs.CALL_STREAM_FLOW_STATE_STARTED
content.stream.Media.ReportReceivingFailure(
- cs.CALL_SCR_MEDIA_ERROR, "", "receiving error")
+ cs.CALL_STATE_CHANGE_REASON_MEDIA_ERROR, "", "receiving error")
o = self.q.expect_many(
EventPattern('dbus-signal', signal='ReceivingStateChanged',
More information about the telepathy-commits
mailing list