<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Introduce global guard timer in test_CT<br><br>We did have a guard time in each ConnHdlr, but not in the MTC (test_CT).<br><br>However, we do have tests that don't use any ConnHdlr, and those were so<br>far ran without a guard timeout. Fix that.<br><br>Change-Id: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>1 file changed, 11 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn</span><br><span>index a2055ea..7811a01 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -279,6 +279,7 @@</span><br><span>    var boolean g_use_echo := false;</span><br><span> </span><br><span>         var ro_integer g_roi := {};</span><br><span style="color: hsl(120, 100%, 40%);">+   timer g_Tguard;</span><br><span> };</span><br><span> </span><br><span> type component BSSGP_ConnHdlr {</span><br><span>@@ -414,7 +415,7 @@</span><br><span>   return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init(float t_guard := 30.0) runs on test_CT {</span><br><span>  var ro_integer bvci_unblocked := {};</span><br><span>         var BssgpStatusIndication bsi;</span><br><span>       var integer i;</span><br><span>@@ -424,6 +425,9 @@</span><br><span>         }</span><br><span>    g_initialized := true;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    g_Tguard.start(t_guard);</span><br><span style="color: hsl(120, 100%, 40%);">+      activate(as_gTguard(g_Tguard));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    g_sgsn[0].cfg := {</span><br><span>           nsei := mp_nsconfig_sgsn[0].nsei,</span><br><span>            sgsn_role := true,</span><br><span>@@ -503,6 +507,9 @@</span><br><span>                     mtc.stop;</span><br><span>            }</span><br><span>    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   /* re-start guard timer after all BVCs are up, so it only counts the actual test case */</span><br><span style="color: hsl(120, 100%, 40%);">+      g_Tguard.start(t_guard);</span><br><span> }</span><br><span> </span><br><span> function f_cleanup() runs on test_CT {</span><br><span>@@ -574,8 +581,8 @@</span><br><span>    sgsn_ct[port_idx] := bvc_ct;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private altstep as_Tguard() runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">-       [] g_Tguard.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_gTguard(timer Tguard) {</span><br><span style="color: hsl(120, 100%, 40%);">+     [] Tguard.timeout {</span><br><span>          setverdict(fail, "Tguard timeout");</span><br><span>                mtc.stop;</span><br><span>    }</span><br><span>@@ -601,7 +608,7 @@</span><br><span>      }</span><br><span> </span><br><span>        g_Tguard.start(pars.t_guard);</span><br><span style="color: hsl(0, 100%, 40%);">-   activate(as_Tguard());</span><br><span style="color: hsl(120, 100%, 40%);">+        activate(as_gTguard(g_Tguard));</span><br><span> </span><br><span>  /* call the user-supplied test case function */</span><br><span>      fn.apply(id);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632">change 21632</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/+/21632"/><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: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f </div>
<div style="display:none"> Gerrit-Change-Number: 21632 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>