<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14900">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: use f_expect_clear() in check IMEI tests<br><br>Fix the broken pipe race condition caused by closing the RAN connection<br>too early. Properly wait for clear command and send clear complete.<br><br>TC_lu_imsi_auth_tmsi_check_imei_{nack,err} do not pass anymore, because<br>OsmoMSC is sending the LU reject twice. Patch [1] fixes it.<br><br>[1] I127b27937613ea0ff29d67991c0414fca6d441d9 (osmo-msc)<br>Fixes: 1d118ff753d963cfe5feb2450a31bc3a51aa5eb6 ("msc: add check IMEI tests")<br>Change-Id: I836f76242463789c4c003feec757714827f2a31b<br>---<br>M msc/MSC_Tests.ttcn<br>M msc/expected-results.xml<br>2 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index c7c96eb..15ff17c 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -5618,7 +5618,7 @@</span><br><span> f_msc_lu_hlr();</span><br><span> f_mm_imei();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Expect reject. As of writing, sometimes it passes, sometimes we get a broken pipe (race condition)! */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect reject */</span><br><span> alt {</span><br><span> [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {</span><br><span> setverdict(pass);</span><br><span>@@ -5628,6 +5628,7 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_nack() runs on MTC_CT {</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span>@@ -5658,7 +5659,7 @@</span><br><span> f_msc_lu_hlr();</span><br><span> f_mm_imei();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Expect reject. As of writing, sometimes it passes, sometimes we get a broken pipe (race condition)! */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect reject */</span><br><span> alt {</span><br><span> [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {</span><br><span> setverdict(pass);</span><br><span>@@ -5668,6 +5669,7 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_err() runs on MTC_CT {</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span>@@ -5769,6 +5771,7 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_early_nack() runs on MTC_CT {</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span>@@ -5807,6 +5810,7 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_early_err() runs on MTC_CT {</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span>diff --git a/msc/expected-results.xml b/msc/expected-results.xml</span><br><span>index 28a6728..96af4a4 100644</span><br><span>--- a/msc/expected-results.xml</span><br><span>+++ b/msc/expected-results.xml</span><br><span>@@ -1,5 +1,5 @@</span><br><span> <?xml version="1.0"?></span><br><span style="color: hsl(0, 100%, 40%);">-<testsuite name='Titan' tests='154' failures='9' errors='2' skipped='0' inconc='0' time='MASKED'></span><br><span style="color: hsl(120, 100%, 40%);">+<testsuite name='Titan' tests='154' failures='9' errors='0' skipped='0' inconc='0' time='MASKED'></span><br><span> <testcase classname='MSC_Tests' name='TC_cr_before_reset' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_noauth_tmsi' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_noauth_notmsi' time='MASKED'/></span><br><span>@@ -102,12 +102,8 @@</span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_auth3g_tmsi_check_imei' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_noauth_tmsi_check_imei' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_noauth_notmsi_check_imei' time='MASKED'/></span><br><span style="color: hsl(0, 100%, 40%);">- <testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_check_imei_nack' time='MASKED'></span><br><span style="color: hsl(0, 100%, 40%);">- <error type='DTE'></error></span><br><span style="color: hsl(0, 100%, 40%);">- </testcase></span><br><span style="color: hsl(0, 100%, 40%);">- <testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_check_imei_err' time='MASKED'></span><br><span style="color: hsl(0, 100%, 40%);">- <error type='DTE'></error></span><br><span style="color: hsl(0, 100%, 40%);">- </testcase></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_check_imei_nack' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_check_imei_err' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_check_imei_early' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_auth3g_tmsi_check_imei_early' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_noauth_tmsi_check_imei_early' time='MASKED'/></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14900">change 14900</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/osmo-ttcn3-hacks/+/14900"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I836f76242463789c4c003feec757714827f2a31b </div>
<div style="display:none"> Gerrit-Change-Number: 14900 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>