<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10580">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Matthew Fredrickson: Looks good to me, but someone else must approve
Corey Farrell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Certify_libsrtp2: Changes in Testsuite to certify libsrtp2<br><br>Two items were changed in testsuite that were causing libsrtp2<br>tests to fail:<br>1- Added sending new ACK after receiving 488 on the decline test<br>2- Change runtests.py line 44 to set asterisk scripts paths<br> to first in path list instead of last. Previously set to last<br> in line caused an error if other python modules "Asterisk"<br> exists in other paths.<br><br>Change-Id: Ie7e7f4b1937676f033de8e7f9459594c2a7fcacc<br>---<br>M runtests.py<br>M tests/channels/pjsip/secure_calling/srtp_negotiation/sipp/decline.xml<br>2 files changed, 19 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/runtests.py b/runtests.py</span><br><span>index 3fd5b1b..d1bc4aa 100755</span><br><span>--- a/runtests.py</span><br><span>+++ b/runtests.py</span><br><span>@@ -41,7 +41,7 @@</span><br><span> os.mkdir("logs")</span><br><span> </span><br><span> # The current sys.path is only used by runtests.py</span><br><span style="color: hsl(0, 100%, 40%);">-sys.path.append("lib/python")</span><br><span style="color: hsl(120, 100%, 40%);">+sys.path.insert(1,"lib/python")</span><br><span> # The tests themselves are run in a separate process</span><br><span> # so we're going to accumulate additional paths in</span><br><span> # new_PYTHONPATH to pass to the new process.</span><br><span>@@ -51,7 +51,7 @@</span><br><span> new_PYTHONPATH=[]</span><br><span> if os.getenv("PYTHONPATH"):</span><br><span> new_PYTHONPATH.append(os.getenv("PYTHONPATH"))</span><br><span style="color: hsl(0, 100%, 40%);">-new_PYTHONPATH.append("lib/python")</span><br><span style="color: hsl(120, 100%, 40%);">+new_PYTHONPATH.insert(1,"lib/python")</span><br><span> </span><br><span> from asterisk.asterisk import Asterisk</span><br><span> from asterisk.test_config import TestConfig</span><br><span>diff --git a/tests/channels/pjsip/secure_calling/srtp_negotiation/sipp/decline.xml b/tests/channels/pjsip/secure_calling/srtp_negotiation/sipp/decline.xml</span><br><span>index ff1acc2..1d2844c 100644</span><br><span>--- a/tests/channels/pjsip/secure_calling/srtp_negotiation/sipp/decline.xml</span><br><span>+++ b/tests/channels/pjsip/secure_calling/srtp_negotiation/sipp/decline.xml</span><br><span>@@ -43,6 +43,23 @@</span><br><span> <recv response="488" rtd="true"></span><br><span> </recv></span><br><span> </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%);">+ ACK sip:echo@[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: test1 <sip:alice@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(120, 100%, 40%);">+ To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]</span><br><span style="color: hsl(120, 100%, 40%);">+ Call-ID: [call_id]</span><br><span style="color: hsl(120, 100%, 40%);">+ CSeq: 1 ACK</span><br><span style="color: hsl(120, 100%, 40%);">+ Contact: sip:test@[local_ip]:[local_port]</span><br><span style="color: hsl(120, 100%, 40%);">+ Max-Forwards: 70</span><br><span style="color: hsl(120, 100%, 40%);">+ Subject: 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> <!-- definition of the response time repartition table (unit is ms) --></span><br><span> <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/></span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10580">change 10580</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/10580"/><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: Ie7e7f4b1937676f033de8e7f9459594c2a7fcacc </div>
<div style="display:none"> Gerrit-Change-Number: 10580 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Chris Savinovich <csavinovich@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Chris Savinovich <csavinovich@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>