[asterisk-commits] mmichelson: testsuite/asterisk/trunk r5576 - /asterisk/trunk/tests/channels/p...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Sep 10 10:35:09 2014
New Revision: 5576

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5576
Log:
Fix test failures in dialog-info tests for Asterisk 12.

In Asterisk 12 and Asterisk 13, the way that local and remote URIs
are stored is different. In the testsuite test, this manifests as
Asterisk 12 not including a port and Asterisk 13 including a port.
For the SIPp scenario, I've now made the inclusion of port 5060
optional. If no port is present, then that's equivalent to port 5060
anyway, so now the test will only fail if a port is included and it's
not 5060.

ASTERISK-24243 #close


Modified:
    asterisk/trunk/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe.xml

Modified: asterisk/trunk/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe.xml?view=diff&rev=5576&r1=5575&r2=5576
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe.xml (original)
+++ asterisk/trunk/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe.xml Wed Sep 10 10:35:09 2014
@@ -24,7 +24,7 @@
 
   <recv request="NOTIFY" crlf="true">
     <action>
-      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"0\" state=\"full\" entity=\"sip:presence at 127.0.0.1:5060\">
+      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"0\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
  <dialog id=\"presence\">
   <state>terminated</state>
  </dialog>
@@ -51,7 +51,7 @@
 
   <recv request="NOTIFY" crlf="true">
     <action>
-      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"sip:presence at 127.0.0.1:5060\">
+      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
  <dialog id=\"presence\">
   <state>early</state>
  </dialog>
@@ -78,7 +78,7 @@
 
   <recv request="NOTIFY" crlf="true">
     <action>
-      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"sip:presence at 127.0.0.1:5060\">
+      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
  <dialog id=\"presence\">
   <state>confirmed</state>
  </dialog>
@@ -105,7 +105,7 @@
 
   <recv request="NOTIFY" crlf="true">
     <action>
-      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"3\" state=\"full\" entity=\"sip:presence at 127.0.0.1:5060\">
+      <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"3\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
  <dialog id=\"presence\">
   <state>confirmed</state>
   <local>