fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256?usp=email )
Change subject: bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop() ......................................................................
bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop()
This fixes sporadic failures in testcases using those altsteps.
Change-Id: I3538d40ff1a585ccbe37f3a90f3c374c5f0b5767 Related: osmocom-bb.git I0046f9c103bcb9207f0c2643c6a806bd56553d77 --- M bts/BTS_Tests.ttcn 1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/36256/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 05a3349..0103bbc 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2190,6 +2190,8 @@ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); repeat; } + /* dequeue (ignore) L1CTL DATA.cnf for UL SACCH (SAPI=0) */ + [] L1CTL.receive(tr_L1CTL_DATA_CONF(g_chan_nr, tr_RslLinkID_SACCH(0))) { repeat; } }
/* handle incoming downlink SACCH, decode the L1 header into the given record */ @@ -2220,6 +2222,8 @@ f_pad_oct(pl, 23, '2B'O))); repeat; } + /* dequeue (ignore) L1CTL DATA.cnf for UL DCCH (SAPI=0) */ + [] L1CTL.receive(tr_L1CTL_DATA_CONF(g_chan_nr, tr_RslLinkID_DCCH(0))) { repeat; } }
private altstep as_l1_tch_loop() runs on ConnHdlr { @@ -2240,6 +2244,8 @@
repeat; } + /* dequeue (ignore) L1CTL TRAFFIC.cnf for UL TCH */ + [] L1CTL.receive(tr_L1CTL_TRAFFIC_CONF(g_chan_nr, tr_RslLinkID_DCCH(0))) { repeat; } }
private type record MeasElem {