<p>Michael Bradeen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/18070">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">unsolicited/notify_after_register: properly handle test scenario<br><br>There were two issues with the existing test.<br><br>First, the xml contained a syntax error which caused an error on<br>current versions of sipp<br><br>Second, the scenario itself can not be handled by one sipp instance<br>as the NOTIFY will not match the call-ID of the REGISTER.<br><br>This is handled by splitting the test into two scenarios, one that<br>Registers with a contact port of 5062 then quits and a second that<br>waits for a NOTIFY on port 5062 then sends a 200 OK.<br><br>The REGISTER scenario waits 500ms for the NOTIFY scenario to start.<br><br>If both scenarios succeed, the test passes.<br><br>Change-Id: I23c7fbea995d99211552321f2d4c7e02806792e4<br>---<br>D tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/notify_after_register.xml<br>A tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/receive_notify.xml<br>A tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/register_and_quit_two.xml<br>M tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/test-config.yaml<br>4 files changed, 53 insertions(+), 42 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/70/18070/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/notify_after_register.xml b/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/notify_after_register.xml</span><br><span>deleted file mode 100644</span><br><span>index afe0fe9..0000000</span><br><span>--- a/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/notify_after_register.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,41 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<scenario name="NOTIFY after REGISTER"></span><br><span style="color: hsl(0, 100%, 40%);">-  <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">-        <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        REGISTER sip:[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">-        Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">-        From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">-        To: "[service]" <sip:[service]@[remote_ip]:[remote_port]></span><br><span style="color: hsl(0, 100%, 40%);">-        Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">-        CSeq: 1 REGISTER</span><br><span style="color: hsl(0, 100%, 40%);">-        Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">-        Contact: <sip:[service]@[local_ip]:[local_port]>;transport=[transport]</span><br><span style="color: hsl(0, 100%, 40%);">-        Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">-        Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        ]]></span><br><span style="color: hsl(0, 100%, 40%);">-  </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  <recv response="200"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  <recv request="NOTIFY" crlf="true"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  <send></span><br><span style="color: hsl(0, 100%, 40%);">-    <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      SIP/2.0 200 OK</span><br><span style="color: hsl(0, 100%, 40%);">-      [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">-      [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">-      [last_To:]</span><br><span style="color: hsl(0, 100%, 40%);">-      [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">-      [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">-      Contact: <sip:[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">-      Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    ]]></span><br><span style="color: hsl(0, 100%, 40%);">-  </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</scenario></span><br><span>diff --git a/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/receive_notify.xml b/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/receive_notify.xml</span><br><span>new file mode 100644</span><br><span>index 0000000..317960c</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/receive_notify.xml</span><br><span>@@ -0,0 +1,24 @@</span><br><span style="color: hsl(120, 100%, 40%);">+<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(120, 100%, 40%);">+<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<scenario name="wait for NOTIFY"></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <recv request="NOTIFY" ></span><br><span style="color: hsl(120, 100%, 40%);">+  </recv></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <send></span><br><span style="color: hsl(120, 100%, 40%);">+    <![CDATA[</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      SIP/2.0 200 OK</span><br><span style="color: hsl(120, 100%, 40%);">+      [last_Via:]</span><br><span style="color: hsl(120, 100%, 40%);">+      [last_From:]</span><br><span style="color: hsl(120, 100%, 40%);">+      [last_To:]</span><br><span style="color: hsl(120, 100%, 40%);">+      [last_Call-ID:]</span><br><span style="color: hsl(120, 100%, 40%);">+      [last_CSeq:]</span><br><span style="color: hsl(120, 100%, 40%);">+      Contact: <sip:[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(120, 100%, 40%);">+      Content-Length: 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    ]]></span><br><span style="color: hsl(120, 100%, 40%);">+  </send></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</scenario></span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/register_and_quit_two.xml b/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/register_and_quit_two.xml</span><br><span>new file mode 100644</span><br><span>index 0000000..b1e0e19</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/sipp/register_and_quit_two.xml</span><br><span>@@ -0,0 +1,27 @@</span><br><span style="color: hsl(120, 100%, 40%);">+<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(120, 100%, 40%);">+<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<scenario name="REGISTER with contact set to 5062"></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <pause milliseconds="1000"/></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <send retrans="500"></span><br><span style="color: hsl(120, 100%, 40%);">+        <![CDATA[</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        REGISTER sip:[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(120, 100%, 40%);">+        Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(120, 100%, 40%);">+        From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]</span><br><span style="color: hsl(120, 100%, 40%);">+        To: "[service]" <sip:[service]@[remote_ip]:[remote_port]></span><br><span style="color: hsl(120, 100%, 40%);">+        Call-ID: [call_id]</span><br><span style="color: hsl(120, 100%, 40%);">+        CSeq: 1 REGISTER</span><br><span style="color: hsl(120, 100%, 40%);">+        Max-Forwards: 70</span><br><span style="color: hsl(120, 100%, 40%);">+        Contact: <sip:[service]@[local_ip]:5062>;transport=[transport]</span><br><span style="color: hsl(120, 100%, 40%);">+        Subject: Performance Test</span><br><span style="color: hsl(120, 100%, 40%);">+        Content-Length: 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        ]]></span><br><span style="color: hsl(120, 100%, 40%);">+  </send></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <recv response="200" /></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</scenario></span><br><span>diff --git a/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/test-config.yaml b/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/test-config.yaml</span><br><span>index 60b8795..cbf9b88 100644</span><br><span>--- a/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/test-config.yaml</span><br><span>+++ b/tests/channels/pjsip/subscriptions/mwi/unsolicited/notify_after_register/test-config.yaml</span><br><span>@@ -32,5 +32,6 @@</span><br><span>     test-iterations:</span><br><span>         -</span><br><span>             scenarios:</span><br><span style="color: hsl(0, 100%, 40%);">-                - { 'key-args': {'scenario': 'notify_after_register.xml', '-p': '5061', '-s': 'alice'} }</span><br><span style="color: hsl(120, 100%, 40%);">+                - { 'key-args': {'scenario': 'register_and_quit_two.xml', '-p': '5061', '-s': 'alice'} }</span><br><span style="color: hsl(120, 100%, 40%);">+                - { 'key-args': {'scenario': 'receive_notify.xml', '-p': '5062', '-s': 'alice'} }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/18070">change 18070</a>. To unsubscribe, or for help writing mail filters, 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/c/testsuite/+/18070"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I23c7fbea995d99211552321f2d4c7e02806792e4 </div>
<div style="display:none"> Gerrit-Change-Number: 18070 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>