[asterisk-commits] jrose: testsuite/asterisk/trunk r4837 - in /asterisk/trunk/tests/channels/pjs...

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Mar 14 11:46:07 2014
New Revision: 4837

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4837
Log:
testsuite: Update PJSIP tests that evaluate TOS settings to go back to decimal

Previously they were changed to strings because another patch changed them to
strings. Now they are back to decimals so I'm changing the expectations back
to decimals.  Also there was an issue with the disallow field (codecs) being
removed from sorcery objects and all of that data is now just in the allow
field. The disallow check is removed as well.

Review: https://reviewboard.asterisk.org/r/3323/

Modified:
    asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
    asterisk/trunk/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml?view=diff&rev=4837&r1=4836&r2=4837
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml Fri Mar 14 11:46:07 2014
@@ -56,8 +56,8 @@
                     AllowSubscribe: 'true'
                     CosVideo: '0'
                     CosAudio: '0'
-                    TosVideo: 'CS0'
-                    TosAudio: 'CS0'
+                    TosVideo: '0'
+                    TosAudio: '0'
                     SdpSession: 'Asterisk'
                     SdpOwner: '-'
                     AllowTransfer: 'true'
@@ -167,7 +167,7 @@
                     ObjectType: 'transport'
                     ObjectName: 'local'
                     Cos: '0'
-                    Tos: 'CS0'
+                    Tos: '0'
                     LocalNet: ''
                     Cipher: ''
                     Method: 'unspecified'

Modified: asterisk/trunk/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf?view=diff&rev=4837&r1=4836&r2=4837
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf Fri Mar 14 11:46:07 2014
@@ -32,8 +32,8 @@
 same => n,GoSub(default,test_variable,1(alice,allow_subscribe,true))
 same => n,GoSub(default,test_variable,1(alice,cos_video,0))
 same => n,GoSub(default,test_variable,1(alice,cos_audio,0))
-same => n,GoSub(default,test_variable,1(alice,tos_video,CS0))
-same => n,GoSub(default,test_variable,1(alice,tos_audio,CS0))
+same => n,GoSub(default,test_variable,1(alice,tos_video,0))
+same => n,GoSub(default,test_variable,1(alice,tos_audio,0))
 same => n,GoSub(default,test_variable,1(alice,sdp_session,Asterisk))
 same => n,GoSub(default,test_variable,1(alice,sdp_owner,-))
 same => n,GoSub(default,test_variable,1(alice,allow_transfer,true))
@@ -91,7 +91,6 @@
 same => n,GoSub(default,test_variable,1(alice,rtp_ipv6,false))
 same => n,GoSub(default,test_variable,1(alice,dtmf_mode,rfc4733))
 same => n,GoSub(default,test_variable,1(alice,allow,(ulaw|alaw)))
-same => n,GoSub(default,test_variable,1(alice,disallow,!(ulaw|alaw)))
 same => n,GoSub(default,test_variable,1(alice,context,default))
 
 ; Check that Bob gives us a different value for something it defined