<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9705">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjsip: Fix transport reuse notify test and failure ripples.<br><br>The tests/channels/pjsip/transport/reuse/notify test exposed a<br>problem in the Alembic for PJSIP. The "mwi_subscribe_replaces_unsolicited"<br>field is an integer instead of a boolean. ASTERISK~27988 has been<br>created to track fixing that explicitly but in the mean time the<br>test configuration has been changed to use "0" to disable it.<br><br>A minor change to the realtime converter has been done so that<br>the database is cleaned up if anything can't be inserted into the<br>database. This was not previously done which caused subsequent tests<br>to fail due to leftover data being in the database.<br><br>Change-Id: Iad39ef71b1758bf781fbf27cbc7229e907e3b26f<br>---<br>M lib/python/asterisk/realtime_converter.py<br>M tests/channels/pjsip/transport/reuse/notify/configs/ast1/pjsip.conf<br>2 files changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/lib/python/asterisk/realtime_converter.py b/lib/python/asterisk/realtime_converter.py</span><br><span>index 95ae579..5359452 100644</span><br><span>--- a/lib/python/asterisk/realtime_converter.py</span><br><span>+++ b/lib/python/asterisk/realtime_converter.py</span><br><span>@@ -257,7 +257,11 @@</span><br><span>         for realtime_file in REALTIME_FILE_REGISTRY:</span><br><span>             realtime_file.write_configs(self.config_dir, test_object.ast[0])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.write_db()</span><br><span style="color: hsl(120, 100%, 40%);">+        try:</span><br><span style="color: hsl(120, 100%, 40%);">+            self.write_db()</span><br><span style="color: hsl(120, 100%, 40%);">+        except:</span><br><span style="color: hsl(120, 100%, 40%);">+            self.cleanup(None)</span><br><span style="color: hsl(120, 100%, 40%);">+            raise</span><br><span> </span><br><span>     def write_extconfig_conf(self):</span><br><span>         """Write the initial extconfig.conf information</span><br><span>diff --git a/tests/channels/pjsip/transport/reuse/notify/configs/ast1/pjsip.conf b/tests/channels/pjsip/transport/reuse/notify/configs/ast1/pjsip.conf</span><br><span>index cce5c32..e4e1673 100644</span><br><span>--- a/tests/channels/pjsip/transport/reuse/notify/configs/ast1/pjsip.conf</span><br><span>+++ b/tests/channels/pjsip/transport/reuse/notify/configs/ast1/pjsip.conf</span><br><span>@@ -19,7 +19,7 @@</span><br><span> aors=alice</span><br><span> auth=alice</span><br><span> mailboxes=1000@default</span><br><span style="color: hsl(0, 100%, 40%);">-mwi_subscribe_replaces_unsolicited=no</span><br><span style="color: hsl(120, 100%, 40%);">+mwi_subscribe_replaces_unsolicited=0</span><br><span> rewrite_contact=yes</span><br><span> </span><br><span> [alice]</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9705">change 9705</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/9705"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iad39ef71b1758bf781fbf27cbc7229e907e3b26f </div>
<div style="display:none"> Gerrit-Change-Number: 9705 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>