<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7572">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update contact status related test with NonQualified nomenclature<br><br>A few tests were checking specifically for the "Created" status. This status<br>has now changed to the more descriptive "NonQualified" status. This patch<br>updates the relevant tests.<br><br>Also the rest-api subscribe-all test was not setting the qualify_frequency, so<br>the endpoint never became "Reachable". This patch also updates that test to<br>specify a qualify_frequency.<br><br>ASTERISK-27467 #close<br><br>Change-Id: Icc6c41f42f9fd465c414b4f3a9eeda2ea15536fa<br>---<br>M tests/channels/pjsip/ami/show_endpoint/test-config.yaml<br>M tests/channels/pjsip/ami/show_registration_inbound_contact_statuses/test-config.yaml<br>M tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml<br>M tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf<br>M tests/channels/pjsip/statsd/contacts/test-config.yaml<br>M tests/rest_api/applications/subscribe-all/test-config.yaml<br>6 files changed, 10 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/tests/channels/pjsip/ami/show_endpoint/test-config.yaml b/tests/channels/pjsip/ami/show_endpoint/test-config.yaml<br>index a48c9b3..e2cd07d 100644<br>--- a/tests/channels/pjsip/ami/show_endpoint/test-config.yaml<br>+++ b/tests/channels/pjsip/ami/show_endpoint/test-config.yaml<br>@@ -418,7 +418,7 @@<br> match:<br> AOR: 'user1'<br> URI: '(sip:user1@127.0.0.1:5062|sip:user1@127.0.0.2:5063)'<br>- Status: '(Unknown|Created|Reachable)'<br>+ Status: '(Unknown|Created|Reachable|NonQualified)'<br> RoundtripUsec: '(N/A|0)'<br> EndpointName: 'user1'<br> count: 2<br>diff --git a/tests/channels/pjsip/ami/show_registration_inbound_contact_statuses/test-config.yaml b/tests/channels/pjsip/ami/show_registration_inbound_contact_statuses/test-config.yaml<br>index 7090f8a..471c3f9 100644<br>--- a/tests/channels/pjsip/ami/show_registration_inbound_contact_statuses/test-config.yaml<br>+++ b/tests/channels/pjsip/ami/show_registration_inbound_contact_statuses/test-config.yaml<br>@@ -41,7 +41,7 @@<br> conditions:<br> match:<br> Event: 'ContactStatus'<br>- ContactStatus: 'Created'<br>+ ContactStatus: 'Created|NonQualified'<br> requirements:<br> match:<br> AOR: 'user1'<br>diff --git a/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml b/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml<br>index 50bd6b3..a493255 100644<br>--- a/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml<br>+++ b/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml<br>@@ -113,7 +113,7 @@<br> conditions:<br> match:<br> Event: 'ContactStatus'<br>- ContactStatus: 'Created'<br>+ ContactStatus: 'Created|NonQualified'<br> requirements:<br> match:<br> AOR: 'user1'<br>diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf b/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf<br>index 3557f12..512859e 100644<br>--- a/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf<br>+++ b/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf<br>@@ -17,13 +17,13 @@<br> <br> ; Test Alice's (dynamic registration) properties<br> same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,uri,sip:alice@127.0.0.1:5061))<br>-same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,status,"(Unknown|Created|Reachable)"))<br>+same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,status,"(Unknown|Created|Reachable|NonQualified)"))<br> same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,rtt,"(N/A|[0-9.]+)"))<br> same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,user_agent,Test))<br> <br> ; Test Bob's (static contact) properties<br> same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,uri,sip:1000@127.0.0.1))<br>-same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,status,(Unknown|Created|Reachable)))<br>+same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,status,(Unknown|Created|Reachable|NonQualified)))<br> same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,rtt,"(N/A|[0-9.]+)"))<br> <br> same => n,UserEvent(Result, Status: passed)<br>diff --git a/tests/channels/pjsip/statsd/contacts/test-config.yaml b/tests/channels/pjsip/statsd/contacts/test-config.yaml<br>index 98edb0a..ed1a3b1 100644<br>--- a/tests/channels/pjsip/statsd/contacts/test-config.yaml<br>+++ b/tests/channels/pjsip/statsd/contacts/test-config.yaml<br>@@ -34,13 +34,13 @@<br> -<br> 'PJSIP\.contacts\.states\.Unknown:0\|g'<br> -<br>- 'PJSIP\.contacts\.states\.Created:0\|g'<br>+ 'PJSIP\.contacts\.states\.(Created|NonQualified):0\|g'<br> -<br> 'PJSIP\.contacts\.states\.Removed:0\|g'<br> -<br>- 'PJSIP\.contacts\.states\.Created:\+1\|g'<br>+ 'PJSIP\.contacts\.states\.(Created|NonQualified):\+1\|g'<br> -<br>- 'PJSIP\.contacts\.states\.Created:\-1\|g'<br>+ 'PJSIP\.contacts\.states\.(Created|NonQualified):\-1\|g'<br> -<br> 'PJSIP\.contacts\.states\.Reachable:\+1\|g'<br> -<br>diff --git a/tests/rest_api/applications/subscribe-all/test-config.yaml b/tests/rest_api/applications/subscribe-all/test-config.yaml<br>index 817afa4..334c7fa 100644<br>--- a/tests/rest_api/applications/subscribe-all/test-config.yaml<br>+++ b/tests/rest_api/applications/subscribe-all/test-config.yaml<br>@@ -47,7 +47,8 @@<br> -<br> method: 'put'<br> uri: 'asterisk/config/dynamic/res_pjsip/aor/alice'<br>- body: { 'fields': [ { 'attribute': 'contact', 'value': 'sip:alice@127.0.0.1:5060;transport=udp' } ] }<br>+ body: { 'fields': [ { 'attribute': 'contact', 'value': 'sip:alice@127.0.0.1:5060;transport=udp' },<br>+ { 'attribute': 'qualify_frequency', value: '5' } ] }<br> expect: 200<br> -<br> method: 'put'<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7572">change 7572</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7572"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Icc6c41f42f9fd465c414b4f3a9eeda2ea15536fa </div>
<div style="display:none"> Gerrit-Change-Number: 7572 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>