<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11224">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;">BTS_Tests.ttcn: fix: properly detect Measurement Reports<br><br>The altstep for detecting Measurement Results, that was introduced<br>in I15782ec93d68a0dc54b2ed7a84cb70d780ba0ce1, was implemented in a<br>wrong way. Basically, the DL Measurement Reports (coming from the<br>MS) are being combined with the UL measurements, and then being<br>send as a RSL_MEAS_RES message, not RSL_INITDATA_IND.<br><br>Let's use the existing as_meas_res() in 'lazy' mode for that.<br><br>Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 2 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 9c749b4..f89025f 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -3735,14 +3735,6 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Expect (or not expect) SACCH messages (Measurement Reports) */</span><br><span style="color: hsl(0, 100%, 40%);">-private altstep as_rsl_sacch_ind(boolean exp_sacch) runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">-       [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">-      [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) {</span><br><span style="color: hsl(0, 100%, 40%);">-            setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!");</span><br><span style="color: hsl(0, 100%, 40%);">-                mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">-               }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span> /* Expect (or not expect) other kinds of messages */</span><br><span> private altstep as_rsl_any_ind(boolean exp_any) runs on ConnHdlr {</span><br><span>     [exp_any] RSL.receive { repeat; }</span><br><span>@@ -3767,7 +3759,7 @@</span><br><span>    [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) {</span><br><span>                setverdict(pass);</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] as_rsl_sacch_ind(exp_sacch);</span><br><span style="color: hsl(120, 100%, 40%);">+       [exp_sacch] as_meas_res(verify_meas := false);</span><br><span>       [] as_rsl_any_ind(exp_any);</span><br><span>  [] T.timeout {</span><br><span>               setverdict(fail, "Timeout waiting for UNIT_DATA_IND");</span><br><span>@@ -3792,7 +3784,7 @@</span><br><span>     [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)) {</span><br><span>            setverdict(pass);</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] as_rsl_sacch_ind(exp_sacch);</span><br><span style="color: hsl(120, 100%, 40%);">+       [exp_sacch] as_meas_res(verify_meas := false);</span><br><span>       [] as_rsl_any_ind(exp_any);</span><br><span>  [] T.timeout {</span><br><span>               setverdict(fail, "Timeout waiting for DATA_IND");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11224">change 11224</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/11224"/><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: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 </div>
<div style="display:none"> Gerrit-Change-Number: 11224 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>