diff options
Diffstat (limited to 'pjsip-apps/src/test-pjsua/scripts-call')
11 files changed, 98 insertions, 82 deletions
diff --git a/pjsip-apps/src/test-pjsua/scripts-call/100_simplecall.py b/pjsip-apps/src/test-pjsua/scripts-call/100_simplecall.py index 1bfb9602..517483be 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/100_simplecall.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/100_simplecall.py @@ -1,10 +1,12 @@ -# $Id:$
-#
-import inc_cfg
-
-# Simple call
-config = inc_cfg.CallConfig(
- title = "Basic call",
- callee_cfg = inc_cfg.Config(arg="--null-audio"),
- caller_cfg = inc_cfg.Config(arg="--null-audio")
- )
+# $Id:$ +# +from inc_cfg import * + +# Simple call +test_param = TestParam( + "Basic call", + [ + InstanceParam("callee", "--null-audio --max-calls=1"), + InstanceParam("caller", "--null-audio --max-calls=1") + ] + ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_0_1.py b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_0_1.py index 69651c83..bf40f0b0 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_0_1.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_0_1.py @@ -1,10 +1,11 @@ -# $Id:$
-#
-import inc_cfg
-
-# Simple call
-config = inc_cfg.CallConfig(
- title = "Callee=no SRTP, caller=optional SRTP",
- callee_cfg = inc_cfg.Config(arg="--null-audio"),
- caller_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=1 --srtp-secure=0")
- )
+# $Id:$ +# +from inc_cfg import * + +test_param= TestParam( + "Callee=no SRTP, caller=optional SRTP", + [ + InstanceParam("callee", "--null-audio --max-calls=1"), + InstanceParam("caller", "--null-audio --use-srtp=1 --srtp-secure=0 --max-calls=1") + ] + ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_0.py b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_0.py index cd9d50bd..7fe8b61e 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_0.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_0.py @@ -1,10 +1,11 @@ -# $Id:$
-#
-import inc_cfg
-
-# Simple call
-config = inc_cfg.CallConfig(
- title = "Callee=optional SRTP, caller=no SRTP",
- callee_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=1 --srtp-secure=0"),
- caller_cfg = inc_cfg.Config(arg="--null-audio")
- )
+# $Id:$ +# +from inc_cfg import * + +test_param = TestParam( + "Callee=optional SRTP, caller=no SRTP", + [ + InstanceParam("callee", "--null-audio --use-srtp=1 --srtp-secure=0 --max-calls=1"), + InstanceParam("caller", "--null-audio --max-calls=1") + ] + ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_1.py b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_1.py index 2a8ece51..90915840 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_1.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_1.py @@ -1,10 +1,11 @@ -# $Id:$
-#
-import inc_cfg
-
-# Simple call
-config = inc_cfg.CallConfig(
- title = "Callee=optional SRTP, caller=optional SRTP",
- callee_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=1 --srtp-secure=0"),
- caller_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=1 --srtp-secure=0")
- )
+# $Id:$ +# +from inc_cfg import * + +test_param = TestParam( + "Callee=optional SRTP, caller=optional SRTP", + [ + InstanceParam("callee", "--null-audio --use-srtp=1 --srtp-secure=0 --max-calls=1"), + InstanceParam("caller", "--null-audio --use-srtp=1 --srtp-secure=0 --max-calls=1") + ] + ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_2.py b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_2.py index 7752293b..03f58863 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_2.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_1_2.py @@ -1,10 +1,11 @@ # $Id$ # -import inc_cfg +from inc_cfg import * -# Simple call -config = inc_cfg.CallConfig( - title = "Callee=optional SRTP, caller=mandatory SRTP", - callee_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=1 --srtp-secure=0"), - caller_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=2 --srtp-secure=0") +test_param = TestParam( + "Callee=optional SRTP, caller=mandatory SRTP", + [ + InstanceParam("callee", "--null-audio --use-srtp=1 --srtp-secure=0 --max-calls=1"), + InstanceParam("caller", "--null-audio --use-srtp=2 --srtp-secure=0 --max-calls=1") + ] ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_1.py b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_1.py index 8c46b939..16341ebe 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_1.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_1.py @@ -1,10 +1,12 @@ # $Id$ # -import inc_cfg +from inc_cfg import * # Simple call -config = inc_cfg.CallConfig( - title = "Callee=mandatory SRTP, caller=optional SRTP", - callee_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=2 --srtp-secure=0"), - caller_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=1 --srtp-secure=0") +test_param = TestParam( + "Callee=mandatory SRTP, caller=optional SRTP", + [ + InstanceParam("callee", "--null-audio --use-srtp=2 --srtp-secure=0 --max-calls=1"), + InstanceParam("caller", "--null-audio --use-srtp=1 --srtp-secure=0 --max-calls=1") + ] ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_2.py b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_2.py index b03978d9..9ec2ab69 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_2.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/150_srtp_2_2.py @@ -1,10 +1,11 @@ # $Id$ # -import inc_cfg +from inc_cfg import * -# Simple call -config = inc_cfg.CallConfig( - title = "Callee=mandatory SRTP, caller=mandatory SRTP", - callee_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=2 --srtp-secure=0"), - caller_cfg = inc_cfg.Config(arg="--null-audio --use-srtp=2 --srtp-secure=0") +test_param = TestParam( + "Callee=mandatory SRTP, caller=mandatory SRTP", + [ + InstanceParam("callee", "--null-audio --use-srtp=2 --srtp-secure=0 --max-calls=1"), + InstanceParam("caller", "--null-audio --use-srtp=2 --srtp-secure=0 --max-calls=1") + ] ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/200_tcp.py b/pjsip-apps/src/test-pjsua/scripts-call/200_tcp.py index 0c96c466..52b5f358 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/200_tcp.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/200_tcp.py @@ -1,11 +1,12 @@ # $Id$ # -import inc_cfg +from inc_cfg import * # TCP call -config = inc_cfg.CallConfig( - title = "TCP transport", - callee_cfg = inc_cfg.Config(arg="--null-audio --no-udp"), - caller_cfg = inc_cfg.Config(arg="--null-audio --no-udp") +test_param = TestParam( + "TCP transport", + [ + InstanceParam("callee", "--null-audio --no-udp", uri_param=";transport=tcp --max-calls=1"), + InstanceParam("caller", "--null-audio --no-udp --max-calls=1") + ] ) -config.uri_param = ";transport=tcp" diff --git a/pjsip-apps/src/test-pjsua/scripts-call/300_ice_0_1.py b/pjsip-apps/src/test-pjsua/scripts-call/300_ice_0_1.py index f95cba73..fb0b9def 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/300_ice_0_1.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/300_ice_0_1.py @@ -1,10 +1,12 @@ -# $Id:$ +# $Id$ # -import inc_cfg +from inc_cfg import * # ICE mismatch -config = inc_cfg.CallConfig( - title = "Callee=no ICE, caller=use ICE", - callee_cfg = inc_cfg.Config(arg="--null-audio"), - caller_cfg = inc_cfg.Config(arg="--null-audio --use-ice") +test_param = TestParam( + "Callee=no ICE, caller=use ICE", + [ + InstanceParam("callee", "--null-audio --max-calls=1"), + InstanceParam("caller", "--null-audio --use-ice --max-calls=1") + ] ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_0.py b/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_0.py index c4dbe9bd..ef800e7f 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_0.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_0.py @@ -1,10 +1,12 @@ -# $Id:$ +# $Id$ # -import inc_cfg - +from inc_cfg import * + # ICE mismatch -config = inc_cfg.CallConfig( - title = "Callee=use ICE, caller=no ICE", - callee_cfg = inc_cfg.Config(arg="--null-audio --use-ice"), - caller_cfg = inc_cfg.Config(arg="--null-audio") +test_param = TestParam( + "Callee=use ICE, caller=no ICE", + [ + InstanceParam("callee", "--null-audio --use-ice --max-calls=1"), + InstanceParam("caller", "--null-audio --max-calls=1") + ] ) diff --git a/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_1.py b/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_1.py index 19a32322..0bf8cc15 100644 --- a/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_1.py +++ b/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_1.py @@ -1,10 +1,12 @@ -# $Id:$ +# $Id$ # -import inc_cfg +from inc_cfg import * # ICE mismatch -config = inc_cfg.CallConfig( - title = "Callee=use ICE, caller=use ICE", - callee_cfg = inc_cfg.Config(arg="--null-audio --use-ice"), - caller_cfg = inc_cfg.Config(arg="--null-audio --use-ice") +test_param = TestParam( + "Callee=use ICE, caller=use ICE", + [ + InstanceParam("callee", "--null-audio --use-ice --max-calls=1"), + InstanceParam("caller", "--null-audio --use-ice --max-calls=1") + ] ) |