<p>Stefan Sperling <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11763">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">attempt to fix a race condition in BSC test's f_ts_dyn_mode_get<br><br>Add two helper functions which retry a VTY command until the<br>result matches a regular expression or a configurable timeout<br>expires.<br><br>Use these functions in BSC test's f_ts_dyn_mode_get, which has<br>seen sporadic failures due to a race condition during channel<br>reconfiguration, in order to hopefully close this race.<br><br>Change-Id: I308ddb06e440c165fe1e73fe2c1fb78be2e1d510<br>Related: OS#3690<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/Osmocom_VTY_Functions.ttcn<br>2 files changed, 24 insertions(+), 2 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 e06f496..21ec0ff 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -2761,8 +2761,7 @@</span><br><span> runs on test_CT return charstring {</span><br><span> var charstring cmd, resp;</span><br><span> cmd := "show timeslot "&int2str(bts_nr)&" "&int2str(trx_nr)&" "&int2str(ts_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- resp := f_vty_transceive_ret(BSCVTY, cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- return regexp(resp, "*\((*)\)*", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return f_vty_transceive_match_regexp_retry(BSCVTY, cmd, "*\((*)\)*", 0, 4, 1.0);</span><br><span> }</span><br><span> </span><br><span> private function f_ts_dyn_mode_assert(integer bts_nr, integer trx_nr, integer ts_nr,</span><br><span>diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn</span><br><span>index 86f58f1..4f795ad 100644</span><br><span>--- a/library/Osmocom_VTY_Functions.ttcn</span><br><span>+++ b/library/Osmocom_VTY_Functions.ttcn</span><br><span>@@ -1,5 +1,6 @@</span><br><span> module Osmocom_VTY_Functions {</span><br><span> import from TELNETasp_PortType all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from Osmocom_Types all;</span><br><span> </span><br><span> modulepar {</span><br><span> charstring mp_prompt_prefix := "OpenBSC";</span><br><span>@@ -153,5 +154,27 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_vty_transceive_match_regex(TELNETasp_PT pt, charstring cmd, charstring regex, integer groupno) return charstring</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var charstring resp := f_vty_transceive_ret(pt, cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ return regexp(resp, regex, groupno);</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%);">+function f_vty_transceive_match_regexp_retry(TELNETasp_PT pt, charstring cmd, charstring regex,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer groupno, integer num_attempts, float retry_delay) return charstring</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ while (num_attempts > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var charstring ret := f_vty_transceive_match_regex(pt, cmd, regex, groupno);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret != "") {</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(retry_delay);</span><br><span style="color: hsl(120, 100%, 40%);">+ num_attempts := num_attempts - 1;</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%);">+ setverdict(fail, "No matching VTY response for regular expression '", regex,</span><br><span style="color: hsl(120, 100%, 40%);">+ "' after ", num_attempts, " attempts." );</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11763">change 11763</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/11763"/><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: I308ddb06e440c165fe1e73fe2c1fb78be2e1d510 </div>
<div style="display:none"> Gerrit-Change-Number: 11763 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>