[Asterisk-code-review] pjsip/verify bodies: Update based on changes to presence URI. (testsuite[master])

Jenkins2 asteriskteam at digium.com
Fri Nov 10 15:33:09 CST 2017


Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7143 )

Change subject: pjsip/verify_bodies: Update based on changes to presence URI.
......................................................................

pjsip/verify_bodies: Update based on changes to presence URI.

The remote URI no longer contains the display name portion
so update the tests to reflect this.

ASTERISK-27290

Change-Id: I03e432b3e524791da26a41698bb5eabb619274a6
---
M tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml
M tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml
2 files changed, 16 insertions(+), 16 deletions(-)

Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml
index 027c6e1..1c81712 100644
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml
@@ -16,7 +16,7 @@
         fails.'
 
 properties:
-    minversion: '12.5.0'
+    minversion: ['13.19.0', '15.2.0']
     dependencies:
         - buildoption: 'TEST_FRAMEWORK'
         - sipp :
@@ -131,31 +131,31 @@
             -
                 note: 'Ready'
                 basic: 'open'
-                contact: '^"alice" <sip:alice at 127.0.0.1(:5060)?>$'
+                contact: '^sip:alice at 127.0.0.1(:5060)?$'
             -
                 note: 'Ringing'
                 basic: 'open'
-                contact: '^"alice" <sip:alice at 127.0.0.1(:5060)?>$'
+                contact: '^sip:alice at 127.0.0.1(:5060)?$'
             -
                 note: 'On the phone'
                 basic: 'open'
-                contact: '^"alice" <sip:alice at 127.0.0.1(:5060)?>$'
+                contact: '^sip:alice at 127.0.0.1(:5060)?$'
             -
                 note: 'On hold'
                 basic: 'open'
-                contact: '^"alice" <sip:alice at 127.0.0.1(:5060)?>$'
+                contact: '^sip:alice at 127.0.0.1(:5060)?$'
             -
                 note: 'On the phone'
                 basic: 'open'
-                contact: '^"alice" <sip:alice at 127.0.0.1(:5060)?>$'
+                contact: '^sip:alice at 127.0.0.1(:5060)?$'
             -
                 note: 'Unavailable'
                 basic: 'closed'
-                contact: '^"alice" <sip:alice at 127.0.0.1(:5060)?>$'
+                contact: '^sip:alice at 127.0.0.1(:5060)?$'
             -
                 note: 'Ready'
                 basic: 'open'
-                contact: '^"alice" <sip:alice at 127.0.0.1(:5060)?>$'
+                contact: '^sip:alice at 127.0.0.1(:5060)?$'
 
 ami-config:
     -
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml
index 8918bae..a7cc47f 100644
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml
@@ -16,7 +16,7 @@
         fails.'
 
 properties:
-    minversion: '12.5.0'
+    minversion: ['13.19.0', '15.2.0']
     dependencies:
         - buildoption: 'TEST_FRAMEWORK'
         - sipp :
@@ -76,7 +76,7 @@
                     atomid: '^[a-z0-9-]+$'
                     id: '^bob$'
                 address:
-                    uri: '^"alice" <sip:alice at 127.0.0.1(:5060)?>;user=ip$'
+                    uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
                     priority: '^0\.80000$'
                 status:
                     status: '^open$'
@@ -89,7 +89,7 @@
                     atomid: '^[a-z0-9-]+$'
                     id: '^bob$'
                 address:
-                    uri: '^"alice" <sip:alice at 127.0.0.1(:5060)?>;user=ip$'
+                    uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
                     priority: '^0\.80000$'
                 status:
                     status: '^inuse$'
@@ -102,7 +102,7 @@
                     atomid: '^[a-z0-9-]+$'
                     id: '^bob$'
                 address:
-                    uri: '^"alice" <sip:alice at 127.0.0.1(:5060)?>;user=ip$'
+                    uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
                     priority: '^0\.80000$'
                 status:
                     status: '^inuse$'
@@ -115,7 +115,7 @@
                     atomid: '^[a-z0-9-]+$'
                     id: '^bob$'
                 address:
-                    uri: '^"alice" <sip:alice at 127.0.0.1(:5060)?>;user=ip$'
+                    uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
                     priority: '^0\.80000$'
                 status:
                     status: '^inuse$'
@@ -128,7 +128,7 @@
                     atomid: '^[a-z0-9-]+$'
                     id: '^bob$'
                 address:
-                    uri: '^"alice" <sip:alice at 127.0.0.1(:5060)?>;user=ip$'
+                    uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
                     priority: '^0\.80000$'
                 status:
                     status: '^inuse$'
@@ -141,7 +141,7 @@
                     atomid: '^[a-z0-9-]+$'
                     id: '^bob$'
                 address:
-                    uri: '^"alice" <sip:alice at 127.0.0.1(:5060)?>;user=ip$'
+                    uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
                     priority: '^0\.80000$'
                 status:
                     status: '^closed$'
@@ -154,7 +154,7 @@
                     atomid: '^[a-z0-9-]+$'
                     id: '^bob$'
                 address:
-                    uri: '^"alice" <sip:alice at 127.0.0.1(:5060)?>;user=ip$'
+                    uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
                     priority: '^0\.80000$'
                 status:
                     status: '^open$'

-- 
To view, visit https://gerrit.asterisk.org/7143
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I03e432b3e524791da26a41698bb5eabb619274a6
Gerrit-Change-Number: 7143
Gerrit-PatchSet: 2
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171110/cd6519ee/attachment-0001.html>


More information about the asterisk-code-review mailing list