<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/19840">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: modify timing on NOTIFY tests<br><br>Changes in pjsip 2.13 forced small timing in NOTIFY on<br>SUBSCRIBE changes that were enough to cause false negatives<br>for tests that were ending early based on local events.<br><br>These tests have been modified to let the SIP scenario<br>complete before terminating.<br><br>ASTERISK-30325<br><br>Change-Id: I4cc096e4b8981ee444743cfa16b834fdd9de71f4<br>---<br>M tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/driver.py<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/driver.py<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/driver.py<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/driver.py<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/driver.py<br>M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml<br>11 files changed, 35 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/40/19840/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py b/tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py</span><br><span>index 2ef8d4f..0c8728a 100644</span><br><span>--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py</span><br><span>+++ b/tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py</span><br><span>@@ -417,4 +417,5 @@</span><br><span> """</span><br><span> LOGGER.error(message)</span><br><span> self.test_object.set_passed(False)</span><br><span style="color: hsl(0, 100%, 40%);">- self.test_object.stop_reactor()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Let the test timeout based on sipp or messages, don't stop it here in case</span><br><span style="color: hsl(120, 100%, 40%);">+ # there are any pending messages in the ether.</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/driver.py b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/driver.py</span><br><span>index 3aaa0d7..2d99fbe 100755</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/driver.py</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/driver.py</span><br><span>@@ -123,4 +123,5 @@</span><br><span> self.state = TERMINATED</span><br><span> # If we've made it here, then the test has passed!</span><br><span> self.test_object.set_passed(True)</span><br><span style="color: hsl(0, 100%, 40%);">- self.test_object.stop_reactor()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Let the test timeout based on sipp or messages, don't stop it here in case</span><br><span style="color: hsl(120, 100%, 40%);">+ # there are any pending messages in the ether.</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml</span><br><span>index 9391fd6..215fed2 100644</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml</span><br><span>@@ -46,7 +46,7 @@</span><br><span> typename: 'driver.TestDriver'</span><br><span> </span><br><span> test-case-config:</span><br><span style="color: hsl(0, 100%, 40%);">- stop-after-scenarios: False</span><br><span style="color: hsl(120, 100%, 40%);">+ stop-after-scenarios: True</span><br><span> test-iterations:</span><br><span> -</span><br><span> scenarios:</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/driver.py b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/driver.py</span><br><span>index 703306f..27b45d9 100755</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/driver.py</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/driver.py</span><br><span>@@ -129,4 +129,5 @@</span><br><span> self.state = TERMINATED</span><br><span> # If we've made it here, then the test has passed!</span><br><span> self.test_object.set_passed(True)</span><br><span style="color: hsl(0, 100%, 40%);">- self.test_object.stop_reactor()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Let the test timeout based on sipp or messages, don't stop it here in case</span><br><span style="color: hsl(120, 100%, 40%);">+ # there are any pending messages in the ether.</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml</span><br><span>index 6954384..736e767 100644</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml</span><br><span>@@ -40,7 +40,7 @@</span><br><span> typename: 'driver.TestDriver'</span><br><span> </span><br><span> test-case-config:</span><br><span style="color: hsl(0, 100%, 40%);">- stop-after-scenarios: False</span><br><span style="color: hsl(120, 100%, 40%);">+ stop-after-scenarios: True</span><br><span> test-iterations:</span><br><span> -</span><br><span> scenarios:</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/driver.py b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/driver.py</span><br><span>index 63d5d97..64831f0 100755</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/driver.py</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/driver.py</span><br><span>@@ -127,4 +127,5 @@</span><br><span> self.state = TERMINATED</span><br><span> # If we've made it here, then the test has passed!</span><br><span> self.test_object.set_passed(True)</span><br><span style="color: hsl(0, 100%, 40%);">- self.test_object.stop_reactor()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Let the test timeout based on sipp or messages, don't stop it here in case</span><br><span style="color: hsl(120, 100%, 40%);">+ # there are any pending messages in the ether.</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml</span><br><span>index f273987..c60dd86 100644</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml</span><br><span>@@ -40,7 +40,7 @@</span><br><span> typename: 'driver.TestDriver'</span><br><span> </span><br><span> test-case-config:</span><br><span style="color: hsl(0, 100%, 40%);">- stop-after-scenarios: False</span><br><span style="color: hsl(120, 100%, 40%);">+ stop-after-scenarios: True</span><br><span> test-iterations:</span><br><span> -</span><br><span> scenarios:</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/driver.py b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/driver.py</span><br><span>index 59eb832..24e9e7d 100755</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/driver.py</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/driver.py</span><br><span>@@ -303,7 +303,8 @@</span><br><span> </span><br><span> # If we've made it here, then the test has passed!</span><br><span> self.test_object.set_passed(True)</span><br><span style="color: hsl(0, 100%, 40%);">- self.test_object.stop_reactor()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Let the test timeout based on sipp or messages, don't stop it here in case</span><br><span style="color: hsl(120, 100%, 40%);">+ # there are any pending messages in the ether.</span><br><span> </span><br><span> def transition_user(self):</span><br><span> """ Transitions the current user to the next user in the list.</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml</span><br><span>index f799e60..00876a5 100644</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml</span><br><span>@@ -45,7 +45,7 @@</span><br><span> typename: 'driver.TestDriver'</span><br><span> </span><br><span> test-case-config:</span><br><span style="color: hsl(0, 100%, 40%);">- stop-after-scenarios: False</span><br><span style="color: hsl(120, 100%, 40%);">+ stop-after-scenarios: True</span><br><span> test-iterations:</span><br><span> -</span><br><span> scenarios:</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/driver.py b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/driver.py</span><br><span>index afb7a29..1b30e4e 100755</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/driver.py</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/driver.py</span><br><span>@@ -127,4 +127,5 @@</span><br><span> self.state = TERMINATED</span><br><span> # If we've made it here, then the test has passed!</span><br><span> self.test_object.set_passed(True)</span><br><span style="color: hsl(0, 100%, 40%);">- self.test_object.stop_reactor()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Let the test timeout based on sipp or messages, don't stop it here in case</span><br><span style="color: hsl(120, 100%, 40%);">+ # there are any pending messages in the ether.</span><br><span>diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml</span><br><span>index 8757ae8..1c2f745 100644</span><br><span>--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml</span><br><span>+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml</span><br><span>@@ -37,7 +37,7 @@</span><br><span> typename: 'driver.TestDriver'</span><br><span> </span><br><span> test-case-config:</span><br><span style="color: hsl(0, 100%, 40%);">- stop-after-scenarios: False</span><br><span style="color: hsl(120, 100%, 40%);">+ stop-after-scenarios: True</span><br><span> test-iterations:</span><br><span> -</span><br><span> scenarios:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/19840">change 19840</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/+/19840"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 20 </div>
<div style="display:none"> Gerrit-Change-Id: I4cc096e4b8981ee444743cfa16b834fdd9de71f4 </div>
<div style="display:none"> Gerrit-Change-Number: 19840 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-CC: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>