<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10549">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">testsuite: Fix failing SIP blind transfer tests.<br><br>A recent change to pjproject caused pjsua to use TCP by default for<br>these tests instead of UDP. This change forces pjsua to not use TCP.<br><br>ASTERISK-28085 #close<br>Reported-by: Joshua C. Colp<br><br>Change-Id: Ice3a588e2c35e3bfcaf057976772e522af1e95f9<br>---<br>M tests/channels/SIP/sip_blind_transfer/callee_refer_only/run-test<br>M tests/channels/SIP/sip_blind_transfer/callee_refer_only/test-config.yaml<br>M tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/run-test<br>M tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/test-config.yaml<br>M tests/channels/SIP/sip_blind_transfer/caller_refer_only/run-test<br>M tests/channels/SIP/sip_blind_transfer/caller_refer_only/test-config.yaml<br>M tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/run-test<br>M tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/test-config.yaml<br>8 files changed, 24 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/channels/SIP/sip_blind_transfer/callee_refer_only/run-test b/tests/channels/SIP/sip_blind_transfer/callee_refer_only/run-test</span><br><span>index b5e56d2..f7da145 100755</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/callee_refer_only/run-test</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/callee_refer_only/run-test</span><br><span>@@ -136,15 +136,18 @@</span><br><span> def start_processes(self):</span><br><span> logger.debug("Starting Processes")</span><br><span> self.pja = subprocess.Popen(['pjsua', '--local-port=5065',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjb = subprocess.Popen(['pjsua', '--local-port=5066',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjc = subprocess.Popen(['pjsua', '--local-port=5067',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> </span><br><span>diff --git a/tests/channels/SIP/sip_blind_transfer/callee_refer_only/test-config.yaml b/tests/channels/SIP/sip_blind_transfer/callee_refer_only/test-config.yaml</span><br><span>index 5d59ae2..a751bc2 100644</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/callee_refer_only/test-config.yaml</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/callee_refer_only/test-config.yaml</span><br><span>@@ -1,5 +1,4 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- skip: 'See ASTERISK-28085'</span><br><span> summary: 'Test SIP Blind Transfer (callee transfers)'</span><br><span> description: |</span><br><span> This test verifies a SIP Blind transfer in which</span><br><span>diff --git a/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/run-test b/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/run-test</span><br><span>index daf7474..3ad650d 100755</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/run-test</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/run-test</span><br><span>@@ -138,15 +138,18 @@</span><br><span> def start_processes(self):</span><br><span> logger.debug("Starting Processes")</span><br><span> self.pja = subprocess.Popen(['pjsua', '--local-port=5065',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjb = subprocess.Popen(['pjsua', '--local-port=5066',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjc = subprocess.Popen(['pjsua', '--local-port=5067',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> </span><br><span>diff --git a/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/test-config.yaml b/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/test-config.yaml</span><br><span>index fed5922..8a25e9a 100644</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/test-config.yaml</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/callee_with_reinvite/test-config.yaml</span><br><span>@@ -1,5 +1,4 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- skip: 'See ASTERISK-28085'</span><br><span> summary: 'Test SIP Blind Transfer (callee transfers with hold)'</span><br><span> description: |</span><br><span> This test verifies a SIP Blind transfer in which</span><br><span>diff --git a/tests/channels/SIP/sip_blind_transfer/caller_refer_only/run-test b/tests/channels/SIP/sip_blind_transfer/caller_refer_only/run-test</span><br><span>index 19dbfd7..0ff23a4 100755</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/caller_refer_only/run-test</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/caller_refer_only/run-test</span><br><span>@@ -139,15 +139,18 @@</span><br><span> def start_processes(self):</span><br><span> logger.debug("Starting Processes")</span><br><span> self.pja = subprocess.Popen(['pjsua', '--local-port=5065',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjb = subprocess.Popen(['pjsua', '--local-port=5066',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjc = subprocess.Popen(['pjsua', '--local-port=5067',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> </span><br><span>diff --git a/tests/channels/SIP/sip_blind_transfer/caller_refer_only/test-config.yaml b/tests/channels/SIP/sip_blind_transfer/caller_refer_only/test-config.yaml</span><br><span>index f42d8cf..f4c608b 100644</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/caller_refer_only/test-config.yaml</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/caller_refer_only/test-config.yaml</span><br><span>@@ -1,5 +1,4 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- skip: 'See ASTERISK-28085'</span><br><span> summary: 'Test SIP Blind Transfer (caller transfers)'</span><br><span> description: |</span><br><span> This test verifies a SIP Blind transfer in which</span><br><span>diff --git a/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/run-test b/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/run-test</span><br><span>index 880ab88..0731eba 100755</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/run-test</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/run-test</span><br><span>@@ -144,15 +144,18 @@</span><br><span> def start_processes(self):</span><br><span> logger.debug("Starting Processes")</span><br><span> self.pja = subprocess.Popen(['pjsua', '--local-port=5065',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjb = subprocess.Popen(['pjsua', '--local-port=5066',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> self.pjc = subprocess.Popen(['pjsua', '--local-port=5067',</span><br><span style="color: hsl(0, 100%, 40%);">- '--auto-answer=200', '--null-audio'],</span><br><span style="color: hsl(120, 100%, 40%);">+ '--auto-answer=200', '--null-audio',</span><br><span style="color: hsl(120, 100%, 40%);">+ '--no-tcp'],</span><br><span> stdin=subprocess.PIPE,</span><br><span> stdout=subprocess.PIPE)</span><br><span> </span><br><span>diff --git a/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/test-config.yaml b/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/test-config.yaml</span><br><span>index 0092225..e93443c 100644</span><br><span>--- a/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/test-config.yaml</span><br><span>+++ b/tests/channels/SIP/sip_blind_transfer/caller_with_reinvite/test-config.yaml</span><br><span>@@ -1,5 +1,4 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- skip: 'See ASTERISK-28085'</span><br><span> summary: 'Test SIP Blind Transfer (caller transfers with hold)'</span><br><span> description: |</span><br><span> This test verifies a SIP Blind transfer in which</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10549">change 10549</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/10549"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ice3a588e2c35e3bfcaf057976772e522af1e95f9 </div>
<div style="display:none"> Gerrit-Change-Number: 10549 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Benjamin Keith Ford <bford@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>