[asterisk-commits] kharwell: testsuite/asterisk/trunk r4546 - in /asterisk/trunk/tests/channels/...

[SVN commits to the Asterisk project]

Author: kharwell
Date: Thu Jan  9 17:40:24 2014
New Revision: 4546

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4546
Log:
res_pjsip_messaging: parts of message_from test no longer needed

It was assumed the 'from' parameter in MessageSend needed to be
associated with an endpoint.  Since it does not need to be (from
header defaults as asterisk or the uri given in MessageSend), then
the parts testing that were no longer needed.

(issue ASTERISK-22924)
Reported by: Anthony Messina

Modified:
    asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/extensions.conf
    asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/pjsip.conf
    asterisk/trunk/tests/channels/pjsip/message/message_from/test-config.yaml

Modified: asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/extensions.conf?view=diff&rev=4546&r1=4545&r2=4546
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/extensions.conf Thu Jan  9 17:40:24 2014
@@ -7,7 +7,5 @@
       same => n,Verbose(1,From Hdr: ${MESSAGE_DATA(from)})
       same => n,Verbose(1,Body: ${MESSAGE(body)})
       ; Match the MessageSend() lines with the SIPp scenario
-      same => n,MessageSend(pjsip:user1, sip:user)
-      same => n,MessageSend(pjsip:user2, sip:user/user)
-      same => n,MessageSend(pjsip:user3, sip:user/user at 127.0.0.1)
-      same => n,MessageSend(pjsip:user4, sip:user/"user" <sip:user at 127.0.0.1>)
+      same => n,MessageSend(pjsip:user1, sip:user at 127.0.0.1)
+      same => n,MessageSend(pjsip:user2, "test" <sip:test at localhost>)

Modified: asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/pjsip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/pjsip.conf?view=diff&rev=4546&r1=4545&r2=4546
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/pjsip.conf (original)
+++ asterisk/trunk/tests/channels/pjsip/message/message_from/configs/ast1/pjsip.conf Thu Jan  9 17:40:24 2014
@@ -47,33 +47,3 @@
 direct_media=no
 disallow=all
 allow=ulaw
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-[user3]
-type=aor
-contact=sip:user1 at 127.0.0.1:5064
-max_contacts=1
-
-[user3]
-type=endpoint
-context=default
-aors=user3
-direct_media=no
-disallow=all
-allow=ulaw
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-[user4]
-type=aor
-contact=sip:user1 at 127.0.0.1:5065
-max_contacts=1
-
-[user4]
-type=endpoint
-context=default
-aors=user4
-direct_media=no
-disallow=all
-allow=ulaw

Modified: asterisk/trunk/tests/channels/pjsip/message/message_from/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/message/message_from/test-config.yaml?view=diff&rev=4546&r1=4545&r2=4546
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/message/message_from/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/message/message_from/test-config.yaml Thu Jan  9 17:40:24 2014
@@ -24,7 +24,5 @@
         -
              scenarios:
                 - { 'key-args': { 'scenario':'message_recv.xml', '-p':'5062' }, 'ordered-args': ['-set', 'from', '<sip:user at 127.0.0.1>'] }
-                - { 'key-args': { 'scenario':'message_recv.xml', '-p':'5063' }, 'ordered-args': ['-set', 'from', '<sip:user at 127.0.0.1>'] }
-                - { 'key-args': { 'scenario':'message_recv.xml', '-p':'5064' }, 'ordered-args': ['-set', 'from', '<sip:user at 127.0.0.1>'] }
-                - { 'key-args': { 'scenario':'message_recv.xml', '-p':'5065' }, 'ordered-args': ['-set', 'from', '"user" <sip:user at 127.0.0.1>'] }
+                - { 'key-args': { 'scenario':'message_recv.xml', '-p':'5063' }, 'ordered-args': ['-set', 'from', '"test" <sip:test at localhost>'] }
                 - { 'key-args': { 'scenario':'message.xml', '-p':'5061' } }