<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11658">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: remove flush from f_expect_chan_rel<br><br>When we're expecting release, it can be non-deterministic / timing dependent to<br>flush the RSL queue. Particularly the RR Release message is typically already<br>in the queue when f_expect_chan_rel() is called and would be lost.<br><br>It turns out that none of the current callers need the flush feature.<br><br>If a test needs it, we can add a separate f_rsl_flush() function and call that,<br>no need to clutter up the f_expect_chan_rel() argument list. I had such<br>function but found that no caller needs it, so dropped it.<br><br>Related: OS#3413<br>Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3<br>---<br>M bsc/BSC_Tests.ttcn<br>1 file changed, 3 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index e3ac707..551ffe0 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -824,14 +824,10 @@</span><br><span>      setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, boolean flush := true,</span><br><span style="color: hsl(120, 100%, 40%);">+function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr,</span><br><span>                     boolean handle_rll_rel := true) runs on test_CT {</span><br><span> </span><br><span>     var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0));</span><br><span style="color: hsl(0, 100%, 40%);">-       if (flush) {</span><br><span style="color: hsl(0, 100%, 40%);">-            /* Clear the queue, it might still contain stuff like IMMEDIATE ASSIGN */</span><br><span style="color: hsl(0, 100%, 40%);">-               IPA_RSL[bts_nr].clear;</span><br><span style="color: hsl(0, 100%, 40%);">-  }</span><br><span>    alt {</span><br><span>        /* ignore DEACTIVATE SACCH (if any) */</span><br><span>       [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span>@@ -912,7 +908,7 @@</span><br><span>  /* release the SCCP connection */</span><br><span>    BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  f_expect_chan_rel(0, dt.rsl_chan_nr, true, false);</span><br><span style="color: hsl(120, 100%, 40%);">+    f_expect_chan_rel(0, dt.rsl_chan_nr, handle_rll_rel := false);</span><br><span>       setverdict(pass);</span><br><span> }</span><br><span> </span><br><span>@@ -934,7 +930,7 @@</span><br><span>     [] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { }</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   f_expect_chan_rel(0, dt.rsl_chan_nr, false);</span><br><span style="color: hsl(120, 100%, 40%);">+  f_expect_chan_rel(0, dt.rsl_chan_nr);</span><br><span>        setverdict(pass);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11658">change 11658</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/11658"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3 </div>
<div style="display:none"> Gerrit-Change-Number: 11658 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>