diff options
Diffstat (limited to 'tests/pjsua/scripts-sipp')
| -rw-r--r-- | tests/pjsua/scripts-sipp/transfer-attended.py | 5 | ||||
| -rw-r--r-- | tests/pjsua/scripts-sipp/transfer-unattended.py | 4 | ||||
| -rw-r--r-- | tests/pjsua/scripts-sipp/uas-forked-100rel.xml | 4 | ||||
| -rw-r--r-- | tests/pjsua/scripts-sipp/uas-forked-200.xml | 4 | ||||
| -rw-r--r-- | tests/pjsua/scripts-sipp/uas-inv-answered-with-srtp.xml (renamed from tests/pjsua/scripts-sipp/uas-invite.xml) | 0 | ||||
| -rw-r--r-- | tests/pjsua/scripts-sipp/uas-prack_fork.xml | 5 | ||||
| -rw-r--r-- | tests/pjsua/scripts-sipp/uas-reinv-and-ack-same-branch-without-sdp.xml (renamed from tests/pjsua/scripts-sipp/uas-reinv-and-ack(same-branch)-without-sdp.xml) | 0 |
7 files changed, 12 insertions, 10 deletions
diff --git a/tests/pjsua/scripts-sipp/transfer-attended.py b/tests/pjsua/scripts-sipp/transfer-attended.py index 2cd6ddef..7063d675 100644 --- a/tests/pjsua/scripts-sipp/transfer-attended.py +++ b/tests/pjsua/scripts-sipp/transfer-attended.py @@ -11,6 +11,7 @@ PJSUA_EXPECTS = [ # A calls B [0, "", "m"], [0, "", "sip:localhost:5062"], + [0, const.STATE_CALLING, ""], [1, const.EVENT_INCOMING_CALL, "a"], [1, "", "200"], [0, const.STATE_CONFIRMED, ""], @@ -24,6 +25,7 @@ PJSUA_EXPECTS = [ # B calls C [1, "", "m"], [1, "", "sip:localhost:5064"], + [1, const.STATE_CALLING, ""], [2, const.EVENT_INCOMING_CALL, "a"], [2, "", "200"], [1, const.STATE_CONFIRMED, ""], @@ -46,6 +48,5 @@ PJSUA_EXPECTS = [ [1, "call transfered successfully", ""], [0, const.MEDIA_ACTIVE, ""], [2, const.MEDIA_ACTIVE, ""], - [1, "", " "], - [1, "have 0 active call", ""], + [1, const.STATE_DISCONNECTED, ""] ] diff --git a/tests/pjsua/scripts-sipp/transfer-unattended.py b/tests/pjsua/scripts-sipp/transfer-unattended.py index da404426..0dd6e00d 100644 --- a/tests/pjsua/scripts-sipp/transfer-unattended.py +++ b/tests/pjsua/scripts-sipp/transfer-unattended.py @@ -11,6 +11,7 @@ PJSUA_EXPECTS = [ # A calls B [0, "", "m"], [0, "", "sip:localhost:5062"], + [0, const.STATE_CALLING, ""], [1, const.EVENT_INCOMING_CALL, "a"], [1, "", "200"], [0, const.STATE_CONFIRMED, ""], @@ -25,6 +26,5 @@ PJSUA_EXPECTS = [ [0, const.MEDIA_ACTIVE, ""], [2, const.MEDIA_ACTIVE, ""], [1, "call transfered successfully", ""], - [1, "", " "], - [1, "have 0 active call", ""], + [1, const.STATE_DISCONNECTED, ""] ] diff --git a/tests/pjsua/scripts-sipp/uas-forked-100rel.xml b/tests/pjsua/scripts-sipp/uas-forked-100rel.xml index c2f2044b..3a1ca229 100644 --- a/tests/pjsua/scripts-sipp/uas-forked-100rel.xml +++ b/tests/pjsua/scripts-sipp/uas-forked-100rel.xml @@ -22,9 +22,9 @@ <scenario name="Forked INVITE, one of them require PRACK"> <recv request="INVITE" crlf="true"> <action> - <ereg regexp="branch=([0-9a-zA-Z\-]*)" + <ereg regexp="branch=([^;]*)" search_in="hdr" - header="Via" + header="Via" assign_to="1,2"/> <assign assign_to="1" variable="2"/> <ereg regexp="CSeq: [ 0-9A-Z]+" diff --git a/tests/pjsua/scripts-sipp/uas-forked-200.xml b/tests/pjsua/scripts-sipp/uas-forked-200.xml index 3878ad4a..a67f8cae 100644 --- a/tests/pjsua/scripts-sipp/uas-forked-200.xml +++ b/tests/pjsua/scripts-sipp/uas-forked-200.xml @@ -22,9 +22,9 @@ <scenario name="Forked INVITE, one of them require PRACK"> <recv request="INVITE" crlf="true"> <action> - <ereg regexp="branch=([0-9a-zA-Z]*)" + <ereg regexp="branch=([^;]*)" search_in="hdr" - header="Via" + header="Via" assign_to="1,2"/> <assign assign_to="1" variable="2"/> </action> diff --git a/tests/pjsua/scripts-sipp/uas-invite.xml b/tests/pjsua/scripts-sipp/uas-inv-answered-with-srtp.xml index 1f928e7c..1f928e7c 100644 --- a/tests/pjsua/scripts-sipp/uas-invite.xml +++ b/tests/pjsua/scripts-sipp/uas-inv-answered-with-srtp.xml diff --git a/tests/pjsua/scripts-sipp/uas-prack_fork.xml b/tests/pjsua/scripts-sipp/uas-prack_fork.xml index ae1c6054..ddae747c 100644 --- a/tests/pjsua/scripts-sipp/uas-prack_fork.xml +++ b/tests/pjsua/scripts-sipp/uas-prack_fork.xml @@ -22,8 +22,9 @@ <scenario name="Forked INVITE, one of them require PRACK">
<recv request="INVITE" crlf="true">
<action>
- <ereg regexp="branch=([0-9a-zA-Z]*)"
- search_in="msg"
+ <ereg regexp="branch=([^;]*)"
+ search_in="hdr"
+ header="Via"
assign_to="3"/>
<ereg regexp="CSeq: ([0-9a-zA-Z ]*)"
search_in="msg"
diff --git a/tests/pjsua/scripts-sipp/uas-reinv-and-ack(same-branch)-without-sdp.xml b/tests/pjsua/scripts-sipp/uas-reinv-and-ack-same-branch-without-sdp.xml index cab4e535..cab4e535 100644 --- a/tests/pjsua/scripts-sipp/uas-reinv-and-ack(same-branch)-without-sdp.xml +++ b/tests/pjsua/scripts-sipp/uas-reinv-and-ack-same-branch-without-sdp.xml |