[Asterisk-code-review] pjsip/subscriptions/mwi/sub setup teardown: Fix test after p... (testsuite[master])

[Joshua Colp]

Joshua Colp has uploaded a new change for review.

  https://gerrit.asterisk.org/1531

Change subject: pjsip/subscriptions/mwi/sub_setup_teardown: Fix test after pubsub changes
......................................................................

pjsip/subscriptions/mwi/sub_setup_teardown: Fix test after pubsub changes

Recent pubsub changes made the ordering of SIP messages more
predictable and sane. This test did not get updated to take this
into account. This change does so.

Change-Id: Id80c71a7b4803445750e1bb4a2fc6d23d76e59b1
---
M tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/sipp/mwi_subscription.xml
1 file changed, 4 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/31/1531/1

diff --git a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/sipp/mwi_subscription.xml b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/sipp/mwi_subscription.xml
index da76caf..98fe44e 100644
--- a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/sipp/mwi_subscription.xml
+++ b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/sipp/mwi_subscription.xml
@@ -72,31 +72,14 @@
     ]]>
   </send>
 
+  <recv response="200" rtd="true" />
+
   <recv request="NOTIFY" crlf="true">
     <action>
       <ereg regexp="message-summary" check_it="true" search_in="hdr" header="Event" assign_to="resubevent" />
       <ereg regexp="active;expires=[5,6][0,9][0,5-9]" check_it="true" search_in="hdr" header="Subscription-State" assign_to="resubstate" />
     </action>
   </recv>
-
-  <recv response="200" rtd="true" />
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv request="NOTIFY" crlf="true" />
 
   <send>
     <![CDATA[
@@ -136,14 +119,14 @@
     ]]>
   </send>
 
+  <recv response="200" rtd="true" />
+
   <recv request="NOTIFY" crlf="true">
     <action>
       <ereg regexp="message-summary" check_it="true" search_in="hdr" header="Event" assign_to="unsubevent" />
       <ereg regexp="terminated" check_it="true" search_in="hdr" header="Subscription-State" assign_to="unsubstate" />
     </action>
   </recv>
-
-  <recv response="200" rtd="true" />
 
   <send>
     <![CDATA[

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id80c71a7b4803445750e1bb4a2fc6d23d76e59b1
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp <jcolp at digium.com>