summaryrefslogtreecommitdiffstats
path: root/bsc/BSC_Tests.ttcn
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-11-05 19:15:23 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2018-11-14 16:17:39 +0000
commitf44ccd1af242e25d8fefacd3e2433b99361e4c08 (patch)
treef211378211e60cb789923318d4bce6fd0abcbc39 /bsc/BSC_Tests.ttcn
parente2bd04ad6b80e11940f1986ad6da83160f4c9528 (diff)
bsc: remove flush from f_expect_chan_rel
When we're expecting release, it can be non-deterministic / timing dependent to flush the RSL queue. Particularly the RR Release message is typically already in the queue when f_expect_chan_rel() is called and would be lost. It turns out that none of the current callers need the flush feature. If a test needs it, we can add a separate f_rsl_flush() function and call that, no need to clutter up the f_expect_chan_rel() argument list. I had such function but found that no caller needs it, so dropped it. Related: OS#3413 Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3
Diffstat (limited to 'bsc/BSC_Tests.ttcn')
-rw-r--r--bsc/BSC_Tests.ttcn10
1 files changed, 3 insertions, 7 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index e3ac707..551ffe0 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -824,14 +824,10 @@ testcase TC_late_conn_fail() runs on test_CT {
setverdict(pass);
}
-function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, boolean flush := true,
+function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr,
boolean handle_rll_rel := true) runs on test_CT {
var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0));
- if (flush) {
- /* Clear the queue, it might still contain stuff like IMMEDIATE ASSIGN */
- IPA_RSL[bts_nr].clear;
- }
alt {
/* ignore DEACTIVATE SACCH (if any) */
[] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,
@@ -912,7 +908,7 @@ testcase TC_chan_rel_hard_rlsd_ms_dead() runs on test_CT {
/* release the SCCP connection */
BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0));
- f_expect_chan_rel(0, dt.rsl_chan_nr, true, false);
+ f_expect_chan_rel(0, dt.rsl_chan_nr, handle_rll_rel := false);
setverdict(pass);
}
@@ -934,7 +930,7 @@ testcase TC_chan_rel_a_reset() runs on test_CT {
[] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { }
}
- f_expect_chan_rel(0, dt.rsl_chan_nr, false);
+ f_expect_chan_rel(0, dt.rsl_chan_nr);
setverdict(pass);
}