[Asterisk-code-review] Update contact status related test with NonQualified nomencl... (testsuite[master])
Kevin Harwell
asteriskteam at digium.com
Wed Dec 13 16:49:34 CST 2017
Kevin Harwell has uploaded this change for review. ( https://gerrit.asterisk.org/7572
Change subject: Update contact status related test with NonQualified nomenclature
......................................................................
Update contact status related test with NonQualified nomenclature
A few tests were checking specifically for the "Created" status. This status
has now changed to the more descriptive "NonQualified" status. This patch
updates the relevant tests.
Also the rest-api subscribe-all test was not setting the qualify_frequency, so
the endpoint never became "Reachable". This patch also updates that test to
specify a qualify_frequency.
ASTERISK-27467 #close
Change-Id: Icc6c41f42f9fd465c414b4f3a9eeda2ea15536fa
---
M tests/channels/pjsip/ami/show_endpoint/test-config.yaml
M tests/channels/pjsip/ami/show_registration_inbound_contact_statuses/test-config.yaml
M tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml
M tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf
M tests/channels/pjsip/statsd/contacts/test-config.yaml
M tests/rest_api/applications/subscribe-all/test-config.yaml
6 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/72/7572/1
diff --git a/tests/channels/pjsip/ami/show_endpoint/test-config.yaml b/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
index a48c9b3..e2cd07d 100644
--- a/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
+++ b/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
@@ -418,7 +418,7 @@
match:
AOR: 'user1'
URI: '(sip:user1 at 127.0.0.1:5062|sip:user1 at 127.0.0.2:5063)'
- Status: '(Unknown|Created|Reachable)'
+ Status: '(Unknown|Created|Reachable|NonQualified)'
RoundtripUsec: '(N/A|0)'
EndpointName: 'user1'
count: 2
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
index 7090f8a..471c3f9 100644
--- 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
@@ -41,7 +41,7 @@
conditions:
match:
Event: 'ContactStatus'
- ContactStatus: 'Created'
+ ContactStatus: 'Created|NonQualified'
requirements:
match:
AOR: 'user1'
diff --git a/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml b/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml
index 50bd6b3..a493255 100644
--- a/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml
+++ b/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml
@@ -113,7 +113,7 @@
conditions:
match:
Event: 'ContactStatus'
- ContactStatus: 'Created'
+ ContactStatus: 'Created|NonQualified'
requirements:
match:
AOR: 'user1'
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
index 3557f12..512859e 100644
--- a/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf
+++ b/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf
@@ -17,13 +17,13 @@
; Test Alice's (dynamic registration) properties
same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,uri,sip:alice at 127.0.0.1:5061))
-same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,status,"(Unknown|Created|Reachable)"))
+same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,status,"(Unknown|Created|Reachable|NonQualified)"))
same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,rtt,"(N/A|[0-9.]+)"))
same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,user_agent,Test))
; Test Bob's (static contact) properties
same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,uri,sip:1000 at 127.0.0.1))
-same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,status,(Unknown|Created|Reachable)))
+same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,status,(Unknown|Created|Reachable|NonQualified)))
same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,rtt,"(N/A|[0-9.]+)"))
same => n,UserEvent(Result, Status: passed)
diff --git a/tests/channels/pjsip/statsd/contacts/test-config.yaml b/tests/channels/pjsip/statsd/contacts/test-config.yaml
index 98edb0a..ed1a3b1 100644
--- a/tests/channels/pjsip/statsd/contacts/test-config.yaml
+++ b/tests/channels/pjsip/statsd/contacts/test-config.yaml
@@ -34,13 +34,13 @@
-
'PJSIP\.contacts\.states\.Unknown:0\|g'
-
- 'PJSIP\.contacts\.states\.Created:0\|g'
+ 'PJSIP\.contacts\.states\.(Created|NonQualified):0\|g'
-
'PJSIP\.contacts\.states\.Removed:0\|g'
-
- 'PJSIP\.contacts\.states\.Created:\+1\|g'
+ 'PJSIP\.contacts\.states\.(Created|NonQualified):\+1\|g'
-
- 'PJSIP\.contacts\.states\.Created:\-1\|g'
+ 'PJSIP\.contacts\.states\.(Created|NonQualified):\-1\|g'
-
'PJSIP\.contacts\.states\.Reachable:\+1\|g'
-
diff --git a/tests/rest_api/applications/subscribe-all/test-config.yaml b/tests/rest_api/applications/subscribe-all/test-config.yaml
index 817afa4..334c7fa 100644
--- a/tests/rest_api/applications/subscribe-all/test-config.yaml
+++ b/tests/rest_api/applications/subscribe-all/test-config.yaml
@@ -47,7 +47,8 @@
-
method: 'put'
uri: 'asterisk/config/dynamic/res_pjsip/aor/alice'
- body: { 'fields': [ { 'attribute': 'contact', 'value': 'sip:alice at 127.0.0.1:5060;transport=udp' } ] }
+ body: { 'fields': [ { 'attribute': 'contact', 'value': 'sip:alice at 127.0.0.1:5060;transport=udp' },
+ { 'attribute': 'qualify_frequency', value: '5' } ] }
expect: 200
-
method: 'put'
--
To view, visit https://gerrit.asterisk.org/7572
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc6c41f42f9fd465c414b4f3a9eeda2ea15536fa
Gerrit-Change-Number: 7572
Gerrit-PatchSet: 1
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171213/ad78d9ee/attachment.html>
More information about the asterisk-code-review
mailing list