Author: rmudgett Date: Fri Mar 13 10:57:37 2015 New Revision: 6524 URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=6524 Log: testsuite: Fix HEP tests that fail after fixing pjsip.conf type=global default application.
Fixing ASTERISK-24807 broke the testsuite HEP tests because a header now appears that didn't before. Review: https://reviewboard.asterisk.org/r/4484/ Modified: asterisk/trunk/tests/hep/pjsip-auth/configs/ast1/pjsip.conf asterisk/trunk/tests/hep/pjsip-auth/test-config.yaml asterisk/trunk/tests/hep/pjsip-ipv6/configs/ast1/pjsip.conf asterisk/trunk/tests/hep/pjsip-ipv6/test-config.yaml asterisk/trunk/tests/hep/pjsip/configs/ast1/pjsip.conf asterisk/trunk/tests/hep/pjsip/test-config.yaml Modified: asterisk/trunk/tests/hep/pjsip-auth/configs/ast1/pjsip.conf URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/pjsip-auth/configs/ast1/pjsip.conf?view=diff&rev=6524&r1=6523&r2=6524 ============================================================================== --- asterisk/trunk/tests/hep/pjsip-auth/configs/ast1/pjsip.conf (original) +++ asterisk/trunk/tests/hep/pjsip-auth/configs/ast1/pjsip.conf Fri Mar 13 10:57:37 2015 @@ -1,3 +1,10 @@ +; We must declare a type=global object to work around a bug +; in earlier Asterisk versions that did not apply the defaults +; if no object exists. See ASTERISK-24807 +; The bug is not the purpose of this test. +[global] +type=global + [local-transport-udp] type=transport bind=127.0.0.1 Modified: asterisk/trunk/tests/hep/pjsip-auth/test-config.yaml URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/pjsip-auth/test-config.yaml?view=diff&rev=6524&r1=6523&r2=6524 ============================================================================== --- asterisk/trunk/tests/hep/pjsip-auth/test-config.yaml (original) +++ asterisk/trunk/tests/hep/pjsip-auth/test-config.yaml Fri Mar 13 10:57:37 2015 @@ -79,6 +79,7 @@ - 'From: "test1" <sip:alice-ipv4-udp@127.0.0.1>;tag=(.*)' - 'To: "test" <sip:test@127.0.0.1>' - 'CSeq: 1 INVITE' + - 'Server: (.*)' - 'Content-Length: 0' - ip_family: 2 @@ -100,6 +101,7 @@ - 'From: "test1" <sip:alice-ipv4-udp@127.0.0.1>;tag=(.*)' - 'To: "test" <sip:test@127.0.0.1>;tag=(.*)' - 'CSeq: 1 INVITE' + - 'Server: (.*)' - 'Contact: <sip:127.0.0.1:5060>' - 'Allow: (.*)' - 'Supported: 100rel, timer, replaces, norefersub' @@ -194,6 +196,7 @@ - 'From: "test1" <sip:alice-ipv4-udp@127.0.0.1>;tag=(.*)' - 'To: "test" <sip:test@127.0.0.1>;tag=(.*)' - 'CSeq: 2 BYE' + - 'Server: (.*)' - 'Content-Length: 0' @@ -202,7 +205,8 @@ dependencies: - sipp : version : 'v3.0' - - asterisk : 'res_pjsip' + - asterisk: 'app_echo' + - asterisk: 'res_pjsip' - asterisk: 'res_hep' - asterisk: 'res_hep_pjsip' - python: 'json' Modified: asterisk/trunk/tests/hep/pjsip-ipv6/configs/ast1/pjsip.conf URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/pjsip-ipv6/configs/ast1/pjsip.conf?view=diff&rev=6524&r1=6523&r2=6524 ============================================================================== --- asterisk/trunk/tests/hep/pjsip-ipv6/configs/ast1/pjsip.conf (original) +++ asterisk/trunk/tests/hep/pjsip-ipv6/configs/ast1/pjsip.conf Fri Mar 13 10:57:37 2015 @@ -1,3 +1,10 @@ +; We must declare a type=global object to work around a bug +; in earlier Asterisk versions that did not apply the defaults +; if no object exists. See ASTERISK-24807 +; The bug is not the purpose of this test. +[global] +type=global + [local-transport6-udp] type=transport bind=[::1] Modified: asterisk/trunk/tests/hep/pjsip-ipv6/test-config.yaml URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/pjsip-ipv6/test-config.yaml?view=diff&rev=6524&r1=6523&r2=6524 ============================================================================== --- asterisk/trunk/tests/hep/pjsip-ipv6/test-config.yaml (original) +++ asterisk/trunk/tests/hep/pjsip-ipv6/test-config.yaml Fri Mar 13 10:57:37 2015 @@ -77,6 +77,7 @@ - 'From: "test1" <sip:alice-ipv6-udp@\[::1\]>;tag=(.*)' - 'To: "test" <sip:test@\[::1\]>' - 'CSeq: 1 INVITE' + - 'Server: (.*)' - 'Content-Length: 0' - ip_family: 10 @@ -97,6 +98,7 @@ - 'From: "test1" <sip:alice-ipv6-udp@\[::1\]>;tag=(.*)' - 'To: "test" <sip:test@\[::1\]>;tag=(.*)' - 'CSeq: 1 INVITE' + - 'Server: (.*)' - 'Contact: <sip:\[::1\]:5060>' - 'Allow: (.*)' - 'Supported: 100rel, timer, replaces, norefersub' @@ -188,6 +190,7 @@ - 'From: "test1" <sip:alice-ipv6-udp@\[::1\]>;tag=(.*)' - 'To: "test" <sip:test@\[::1\]>;tag=(.*)' - 'CSeq: 2 BYE' + - 'Server: (.*)' - 'Content-Length: 0' @@ -196,7 +199,8 @@ dependencies: - sipp : version : 'v3.0' - - asterisk : 'res_pjsip' + - asterisk: 'app_echo' + - asterisk: 'res_pjsip' - asterisk: 'res_hep' - asterisk: 'res_hep_pjsip' - python: 'json' Modified: asterisk/trunk/tests/hep/pjsip/configs/ast1/pjsip.conf URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/pjsip/configs/ast1/pjsip.conf?view=diff&rev=6524&r1=6523&r2=6524 ============================================================================== --- asterisk/trunk/tests/hep/pjsip/configs/ast1/pjsip.conf (original) +++ asterisk/trunk/tests/hep/pjsip/configs/ast1/pjsip.conf Fri Mar 13 10:57:37 2015 @@ -1,3 +1,10 @@ +; We must declare a type=global object to work around a bug +; in earlier Asterisk versions that did not apply the defaults +; if no object exists. See ASTERISK-24807 +; The bug is not the purpose of this test. +[global] +type=global + [local-transport-udp] type=transport bind=127.0.0.1 Modified: asterisk/trunk/tests/hep/pjsip/test-config.yaml URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/pjsip/test-config.yaml?view=diff&rev=6524&r1=6523&r2=6524 ============================================================================== --- asterisk/trunk/tests/hep/pjsip/test-config.yaml (original) +++ asterisk/trunk/tests/hep/pjsip/test-config.yaml Fri Mar 13 10:57:37 2015 @@ -76,6 +76,7 @@ - 'From: "test1" <sip:alice-ipv4-udp@127.0.0.1>;tag=(.*)' - 'To: "test" <sip:test@127.0.0.1>' - 'CSeq: 1 INVITE' + - 'Server: (.*)' - 'Content-Length: 0' - ip_family: 2 @@ -96,6 +97,7 @@ - 'From: "test1" <sip:alice-ipv4-udp@127.0.0.1>;tag=(.*)' - 'To: "test" <sip:test@127.0.0.1>;tag=(.*)' - 'CSeq: 1 INVITE' + - 'Server: (.*)' - 'Contact: <sip:127.0.0.1:5060>' - 'Allow: (.*)' - 'Supported: 100rel, timer, replaces, norefersub' @@ -187,6 +189,7 @@ - 'From: "test1" <sip:alice-ipv4-udp@127.0.0.1>;tag=(.*)' - 'To: "test" <sip:test@127.0.0.1>;tag=(.*)' - 'CSeq: 2 BYE' + - 'Server: (.*)' - 'Content-Length: 0' @@ -195,7 +198,8 @@ dependencies: - sipp : version : 'v3.0' - - asterisk : 'res_pjsip' + - asterisk: 'app_echo' + - asterisk: 'res_pjsip' - asterisk: 'res_hep' - asterisk: 'res_hep_pjsip' - python: 'json' -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
