diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2012-06-29 09:01:17 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2012-06-29 09:01:17 +0000 |
commit | 9ca16e58e2801fc85907268f198ce1a2fc68bbe4 (patch) | |
tree | 96bd3412e637cf8fbc9f23e6640eb333c9929484 /tests/pjsua/scripts-sipp | |
parent | b15ee72aa70205f816d819dcc1ca94bf34d50268 (diff) |
Re #1523: use random port for PJSUA instance(s) and configurable SIPp port.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4188 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'tests/pjsua/scripts-sipp')
15 files changed, 25 insertions, 25 deletions
diff --git a/tests/pjsua/scripts-sipp/strict-route.py b/tests/pjsua/scripts-sipp/strict-route.py index 1c9908f4..dcebf6d5 100644 --- a/tests/pjsua/scripts-sipp/strict-route.py +++ b/tests/pjsua/scripts-sipp/strict-route.py @@ -2,7 +2,7 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id=sip:pjsua@localhost --username=pjsua --realm=* sip:sipp@localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 --id=sip:pjsua@localhost --username=pjsua --realm=* $SIPP_URI"] PJSUA_EXPECTS = [[0, "ACK sip:proxy@.* SIP/2\.0", ""], [0, const.STATE_CONFIRMED, "h"] diff --git a/tests/pjsua/scripts-sipp/transfer-attended.py b/tests/pjsua/scripts-sipp/transfer-attended.py index 7063d675..3e4f80a4 100644 --- a/tests/pjsua/scripts-sipp/transfer-attended.py +++ b/tests/pjsua/scripts-sipp/transfer-attended.py @@ -2,15 +2,15 @@ # import inc_const as const -PJSUA = ["--null-audio", # UA0 @ port 5060 - "--null-audio", # UA1 @ port 5062 - "--null-audio" # UA2 @ port 5064 +PJSUA = ["--null-audio", # UA0 + "--null-audio", # UA1 + "--null-audio" # UA2 ] PJSUA_EXPECTS = [ # A calls B [0, "", "m"], - [0, "", "sip:localhost:5062"], + [0, "", "$PJSUA_URI[1]"], [0, const.STATE_CALLING, ""], [1, const.EVENT_INCOMING_CALL, "a"], [1, "", "200"], @@ -24,7 +24,7 @@ PJSUA_EXPECTS = [ # B calls C [1, "", "m"], - [1, "", "sip:localhost:5064"], + [1, "", "$PJSUA_URI[2]"], [1, const.STATE_CALLING, ""], [2, const.EVENT_INCOMING_CALL, "a"], [2, "", "200"], diff --git a/tests/pjsua/scripts-sipp/transfer-unattended.py b/tests/pjsua/scripts-sipp/transfer-unattended.py index 0dd6e00d..37c97124 100644 --- a/tests/pjsua/scripts-sipp/transfer-unattended.py +++ b/tests/pjsua/scripts-sipp/transfer-unattended.py @@ -2,15 +2,15 @@ # import inc_const as const -PJSUA = ["--null-audio", # UA0 @ port 5060 - "--null-audio", # UA1 @ port 5062 - "--null-audio" # UA2 @ port 5064 +PJSUA = ["--null-audio", # UA0 + "--null-audio", # UA1 + "--null-audio" # UA2 ] PJSUA_EXPECTS = [ # A calls B [0, "", "m"], - [0, "", "sip:localhost:5062"], + [0, "", "$PJSUA_URI[1]"], [0, const.STATE_CALLING, ""], [1, const.EVENT_INCOMING_CALL, "a"], [1, "", "200"], @@ -19,7 +19,7 @@ PJSUA_EXPECTS = [ # B transfer A to C [1, "", "x"], - [1, "", "sip:localhost:5064"], + [1, "", "$PJSUA_URI[2]"], [0, const.STATE_CALLING, ""], [2, const.EVENT_INCOMING_CALL, "a"], [2, "", "200"], diff --git a/tests/pjsua/scripts-sipp/uas-answer-200-reinvite-without-sdp.py b/tests/pjsua/scripts-sipp/uas-answer-200-reinvite-without-sdp.py index 7f1de45d..014c73c0 100644 --- a/tests/pjsua/scripts-sipp/uas-answer-200-reinvite-without-sdp.py +++ b/tests/pjsua/scripts-sipp/uas-answer-200-reinvite-without-sdp.py @@ -2,6 +2,6 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 sip:localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 $SIPP_URI"] PJSUA_EXPECTS = [[0, const.STATE_CONFIRMED, "v"]] diff --git a/tests/pjsua/scripts-sipp/uas-answer-200-update-without-sdp.py b/tests/pjsua/scripts-sipp/uas-answer-200-update-without-sdp.py index 8699d0b2..93131594 100644 --- a/tests/pjsua/scripts-sipp/uas-answer-200-update-without-sdp.py +++ b/tests/pjsua/scripts-sipp/uas-answer-200-update-without-sdp.py @@ -2,6 +2,6 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 sip:localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 $SIPP_URI"] PJSUA_EXPECTS = [[0, const.STATE_CONFIRMED, "U"]] diff --git a/tests/pjsua/scripts-sipp/uas-auth.py b/tests/pjsua/scripts-sipp/uas-auth.py index 38a88eb5..533dbac8 100644 --- a/tests/pjsua/scripts-sipp/uas-auth.py +++ b/tests/pjsua/scripts-sipp/uas-auth.py @@ -2,6 +2,6 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id=sip:a@localhost --username=a --realm=* --registrar=sip:localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 --id=sip:a@localhost --username=a --realm=* --registrar=$SIPP_URI"] PJSUA_EXPECTS = [] diff --git a/tests/pjsua/scripts-sipp/uas-cancel-no-final.py b/tests/pjsua/scripts-sipp/uas-cancel-no-final.py index 4d100a14..de59b821 100644 --- a/tests/pjsua/scripts-sipp/uas-cancel-no-final.py +++ b/tests/pjsua/scripts-sipp/uas-cancel-no-final.py @@ -2,6 +2,6 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 sip:localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 $SIPP_URI"] PJSUA_EXPECTS = [[0, const.STATE_EARLY, "h"]] diff --git a/tests/pjsua/scripts-sipp/uas-mwi-0.py b/tests/pjsua/scripts-sipp/uas-mwi-0.py index 722e0b3f..5cb8cc06 100644 --- a/tests/pjsua/scripts-sipp/uas-mwi-0.py +++ b/tests/pjsua/scripts-sipp/uas-mwi-0.py @@ -2,6 +2,6 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:6000 --mwi"] +PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:$SIPP_PORT --mwi"] PJSUA_EXPECTS = [] diff --git a/tests/pjsua/scripts-sipp/uas-mwi.py b/tests/pjsua/scripts-sipp/uas-mwi.py index 722e0b3f..5cb8cc06 100644 --- a/tests/pjsua/scripts-sipp/uas-mwi.py +++ b/tests/pjsua/scripts-sipp/uas-mwi.py @@ -2,6 +2,6 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:6000 --mwi"] +PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:$SIPP_PORT --mwi"] PJSUA_EXPECTS = [] diff --git a/tests/pjsua/scripts-sipp/uas-reinv-glare.py b/tests/pjsua/scripts-sipp/uas-reinv-glare.py index 8699d0b2..93131594 100644 --- a/tests/pjsua/scripts-sipp/uas-reinv-glare.py +++ b/tests/pjsua/scripts-sipp/uas-reinv-glare.py @@ -2,6 +2,6 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 sip:localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 $SIPP_URI"] PJSUA_EXPECTS = [[0, const.STATE_CONFIRMED, "U"]] diff --git a/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py b/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py index c69332ea..0a5fa252 100644 --- a/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py +++ b/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py @@ -2,7 +2,7 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:6000 --add-buddy sip:sipp@localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost --add-buddy $SIPP_URI"] PJSUA_EXPECTS = [[0, "", "s"], [0, "Subscribe presence of:", "1"], diff --git a/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py b/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py index c792bdda..2f5b5a93 100644 --- a/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py +++ b/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py @@ -2,10 +2,10 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:6000 --add-buddy sip:sipp@localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost --add-buddy $SIPP_URI"] PJSUA_EXPECTS = [[0, "", "s"], [0, "Subscribe presence of:", "1"], - [0, "sip:sipp@localhost:6000 .* Online", ""], + [0, "status is Online", ""], [0, "subscription state is TERMINATED", ""] ] diff --git a/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py b/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py index 66c09f55..feac1133 100644 --- a/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py +++ b/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py @@ -2,7 +2,7 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:6000 --add-buddy sip:sipp@localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost --add-buddy $SIPP_URI"] PJSUA_EXPECTS = [[0, "", "s"], [0, "Subscribe presence of:", "1"], diff --git a/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py b/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py index c792bdda..2f5b5a93 100644 --- a/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py +++ b/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py @@ -2,10 +2,10 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:6000 --add-buddy sip:sipp@localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost --add-buddy $SIPP_URI"] PJSUA_EXPECTS = [[0, "", "s"], [0, "Subscribe presence of:", "1"], - [0, "sip:sipp@localhost:6000 .* Online", ""], + [0, "status is Online", ""], [0, "subscription state is TERMINATED", ""] ] diff --git a/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py b/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py index 404603c0..19ecfae9 100644 --- a/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py +++ b/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py @@ -2,7 +2,7 @@ # import inc_const as const -PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost:6000 --add-buddy sip:sipp@localhost:6000"] +PJSUA = ["--null-audio --max-calls=1 --id sip:pjsua@localhost --add-buddy $SIPP_URI"] PJSUA_EXPECTS = [[0, "", "s"], [0, "Subscribe presence of:", "1"], |