bts: TC_rsl_chan_initial_ta: misc improvements

Change-Id: Ifc2c850104b3710679485042ab5b7a758d0ae000
Related: OS#6919
---
M bts/BTS_Tests.ttcn
1 file changed, 7 insertions(+), 9 deletions(-)


git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/41898/1

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 20c16a3..e574cd4 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -3883,7 +3883,7 @@
 /* establish DChan, verify that the BTS sets the TA in the first SACCH L1 header.
 TA for the IMM ASS messages is still controlled by g_pars.l1_pars.ms_actual_ta! */
 private function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr {
-	var uint5_t ta_to_test := 16;
+	const uint5_t ta_to_test := 16;
 	var SacchL1Header l1h;
 
 	f_l1_tune(L1CTL);
@@ -3894,18 +3894,16 @@
 
 	f_est_dchan(more_ies :={valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE, RSL_IE_Body:{timing_adv := ta_to_test}))} );
 
-
+	/* wait for a single DL SACCH block */
 	alt {
-	[] as_l1_sacch_l1h(l1h, do_apply := false) {
-		if (l1h.actual_ta != ta_to_test) {
-			setverdict(fail, "TA in L1 header does not match the signaled (RSL) TA.");
-		}
-
-		}
-
+	[] as_l1_sacch_l1h(l1h, do_apply := false);
 	/* Ignore all other blocks */
 	[] L1CTL.receive { repeat; }
+	}
 
+	if (l1h.actual_ta != ta_to_test) {
+		setverdict(fail, "TA=", l1h.actual_ta, " in the DL SACCH does not match ",
+				 "the signaled (RSL) TA=", ta_to_test);
 	}
 
 	f_rsl_chan_deact();

