[Asterisk-code-review] Testsuite: Update RLS tests for mmichelson's patch (testsuite[master])
Jonathan Rose
asteriskteam at digium.com
Tue Sep 1 17:04:59 CDT 2015
Jonathan Rose has uploaded a new change for review.
https://gerrit.asterisk.org/1173
Change subject: Testsuite: Update RLS tests for mmichelson's patch
......................................................................
Testsuite: Update RLS tests for mmichelson's patch
In preparation for mmichelson's big subscription patch, this commit
makes sure RLS sipp scenarios follow the 200 then NOTIFY convention
rather than anticipating the NOTIFY then 200 OK convention upon
resubscribe/subscription termination.
Change-Id: I0b7f78308cf2caa4061107cc507302dac599c07e
---
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/sipp/termination.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/sipp/termination.xml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/sipp/termination.xml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/sipp/termination.xml
18 files changed, 117 insertions(+), 117 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/73/1173/1
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/sipp/subscribe.xml
index ec363a2..7a8b151 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/sipp/subscribe.xml
@@ -102,6 +102,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -110,12 +116,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
@@ -179,6 +179,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon termination -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -187,12 +193,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/sipp/subscribe.xml
index b09ca0f..3702a63 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/sipp/subscribe.xml
@@ -102,6 +102,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -110,12 +116,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
@@ -179,6 +179,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon termination -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -187,12 +193,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/sipp/subscribe.xml
index c2408ba..8e5d7a8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/sipp/subscribe.xml
@@ -83,6 +83,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -91,12 +97,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/sipp/subscribe.xml
index ec363a2..7a8b151 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/sipp/subscribe.xml
@@ -102,6 +102,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -110,12 +116,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
@@ -179,6 +179,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon termination -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -187,12 +193,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/sipp/subscribe.xml
index 6d09036..e58f921 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/sipp/subscribe.xml
@@ -83,6 +83,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -91,12 +97,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
index 7be5b62..4f13fc5 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon resubscription -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" crlf="true">
+ <!-- NOTIFY upon resubscription -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/sipp/termination.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/sipp/termination.xml
index 8aa8ab5..1eb34cc 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/sipp/termination.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/sipp/termination.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon termination -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" rtd="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" rtd="true">
+ <!-- NOTIFY upon termination -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/sipp/subscribe.xml
index eb42a53..d174daf 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/sipp/subscribe.xml
@@ -102,6 +102,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -110,12 +116,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
@@ -179,6 +179,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon termination -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -187,12 +193,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/sipp/subscribe.xml
index eb42a53..d174daf 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/sipp/subscribe.xml
@@ -102,6 +102,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -110,12 +116,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
@@ -179,6 +179,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon termination -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -187,12 +193,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/sipp/subscribe.xml
index da888c2..b181548 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/sipp/subscribe.xml
@@ -83,6 +83,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -91,12 +97,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
index a2e2b9a..2eac2a0 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
@@ -102,6 +102,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon resubscription -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -110,12 +116,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
@@ -179,14 +179,14 @@
]]>
</send>
- <!-- NOTIFY upon termination -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" crlf="true">
+ <!-- NOTIFY upon termination -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/sipp/subscribe.xml
index 50b4352..e73aae6 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/sipp/subscribe.xml
@@ -83,6 +83,12 @@
]]>
</send>
+ <recv response="200" crlf="true">
+ <action>
+ <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
+ </action>
+ </recv>
+
<!-- NOTIFY upon subscription termination -->
<recv request="NOTIFY" crlf="true">
<action>
@@ -91,12 +97,6 @@
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="notify_to" />
<ereg regexp=".*" search_in="hdr" header="Via:" assign_to="notify_via" />
<ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="notify_cseq" />
- </action>
- </recv>
-
- <recv response="200" crlf="true">
- <action>
- <ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
index dd634cb..6a45e6e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon resubscription -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" crlf="true">
+ <!-- NOTIFY upon resubscription -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/sipp/termination.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/sipp/termination.xml
index 1dc581d..ffe3302 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/sipp/termination.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/sipp/termination.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon termination -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" rtd="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" rtd="true">
+ <!-- NOTIFY upon termination -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
index 7be5b62..4f13fc5 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/sipp/resubscribe.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon resubscription -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" crlf="true">
+ <!-- NOTIFY upon resubscription -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/sipp/termination.xml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/sipp/termination.xml
index 8aa8ab5..1eb34cc 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/sipp/termination.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/sipp/termination.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon termination -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" rtd="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" rtd="true">
+ <!-- NOTIFY upon termination -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
index dd634cb..6a45e6e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/sipp/resubscribe.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon resubscription -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" crlf="true">
+ <!-- NOTIFY upon resubscription -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/sipp/termination.xml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/sipp/termination.xml
index 1dc581d..ffe3302 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/sipp/termination.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/sipp/termination.xml
@@ -80,14 +80,14 @@
]]>
</send>
- <!-- NOTIFY upon termination -->
- <recv request="NOTIFY" crlf="true">
+ <recv response="200" rtd="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
</recv>
- <recv response="200" rtd="true">
+ <!-- NOTIFY upon termination -->
+ <recv request="NOTIFY" crlf="true">
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
</action>
--
To view, visit https://gerrit.asterisk.org/1173
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b7f78308cf2caa4061107cc507302dac599c07e
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Jonathan Rose <jrose at digium.com>
More information about the asterisk-code-review
mailing list