<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fr: Don't wait indefinitely, but wait until all UE components terminate<br><br>Change-Id: Ifdf9c7fb625ccdb467b3b87f79431da18fea5f2e<br>---<br>M fr/FR_Tests.ttcn<br>1 file changed, 14 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/22659/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn</span><br><span>index f3652a3..973f262 100644</span><br><span>--- a/fr/FR_Tests.ttcn</span><br><span>+++ b/fr/FR_Tests.ttcn</span><br><span>@@ -85,6 +85,7 @@</span><br><span> timer g_Tguard;</span><br><span> var LLC_Entities llc;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+type record of UE_CT ro_ue;</span><br><span> </span><br><span> type record UE_Pars {</span><br><span> hexstring imsi,</span><br><span>@@ -120,7 +121,7 @@</span><br><span> }</span><br><span> </span><br><span> function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 30.0)</span><br><span style="color: hsl(0, 100%, 40%);">-runs on test_CT</span><br><span style="color: hsl(120, 100%, 40%);">+runs on test_CT return UE_CT</span><br><span> {</span><br><span> var UE_CT ue_comp;</span><br><span> var UE_Pars ue_pars := {</span><br><span>@@ -133,10 +134,13 @@</span><br><span> connect(ue_comp:BSSGP_SIG[0], bvc_comp:BSSGP_SP_SIG);</span><br><span> connect(ue_comp:BSSGP_PROC[0], bvc_comp:BSSGP_PROC);</span><br><span> ue_comp.start(f_handler_init(fn, id, ue_pars));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ue_comp;</span><br><span> }</span><br><span> </span><br><span> </span><br><span> testcase TC_foo() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var ro_ue ues := {};</span><br><span> </span><br><span> for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) {</span><br><span> g_gb[i].cfg := {</span><br><span>@@ -151,20 +155,26 @@</span><br><span> log("Initializing Gb interface ", i, ": NSEI=", g_gb[i].cfg.nsei);</span><br><span> f_init_gb(g_gb[i], "gb", i);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) {</span><br><span> for (var integer j := 0; j < mp_num_bvc; j := j+1) {</span><br><span> var BSSGP_BVC_CT bvc_comp := f_bssgp_get_bvci_ct(g_gb[i].cfg.bvc[j].bvci, BSSGP_PROC[i]);</span><br><span> for (var integer k := 0; k < mp_num_ue_in_bvc; k := k+1) {</span><br><span> var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k);</span><br><span style="color: hsl(0, 100%, 40%);">- f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp);</span><br><span style="color: hsl(120, 100%, 40%);">+ var UE_CT ue;</span><br><span style="color: hsl(120, 100%, 40%);">+ ue := f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp);</span><br><span style="color: hsl(120, 100%, 40%);">+ ues := ues & { ue };</span><br><span> /* a bit of staggering to ensure the timers above don't run all at the same time */</span><br><span> f_sleep(0.05);</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- while (true) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(100.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* wait for all UE components to terminate */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(ues); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ues[i].done;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> control {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659">change 22659</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/+/22659"/><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: Ifdf9c7fb625ccdb467b3b87f79431da18fea5f2e </div>
<div style="display:none"> Gerrit-Change-Number: 22659 </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-MessageType: newchange </div>