diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 192e9a336..ab7c979c1 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1074,7 +1074,9 @@ testcase TC_deact_sacch() runs on test_CT { } /* verify that given SACCH payload is present */ -private function f_sacch_present(template octetstring l3_exp) runs on ConnHdlr { +private function f_sacch_present(template octetstring l3_exp, + boolean do_fail := true) +runs on ConnHdlr { var L1ctlDlMessage dl; timer T_sacch := 3.0; L1CTL.clear; @@ -1089,7 +1091,10 @@ private function f_sacch_present(template octetstring l3_exp) runs on ConnHdlr { } } [] L1CTL.receive { repeat; } - [] T_sacch.timeout { + [not do_fail] T_sacch.timeout { + log("Timeout waiting for SACCH ", l3_exp); + } + [do_fail] T_sacch.timeout { setverdict(fail, "Timeout waiting for SACCH ", l3_exp); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } @@ -1384,8 +1389,9 @@ private function f_TC_sacch_chan_act_ho_async(charstring id) runs on ConnHdlr { /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); - /* Verify that DL SACCH is being received */ - f_sacch_present(si5); + /* 4.1.3 "If the MS Power IE is present the BTS *may* start transmission + * also on the SACCH". "May" does not mean "shall", so osmo-bts does not. */ + f_sacch_present(si5, do_fail := false); /* Send handover Access Burst and expect SACCH to remain present */ f_L1CTL_RACH(L1CTL, ho_ref, chan_nr := g_pars.chan_nr); @@ -1460,8 +1466,9 @@ private function f_TC_sacch_chan_act_ho_sync(charstring id) runs on ConnHdlr { /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); - /* Verify that DL SACCH is being received, because MS Power IE was sent */ - f_sacch_present(si5); + /* 4.1.4 "If only the MS Power IE is present the BTS *may* start transmission + * also on the SACCH". "May" does not mean "shall", so osmo-bts does not. */ + f_sacch_present(si5, do_fail := false); /* Send handover Access Burst and expect SACCH to remain present */ f_L1CTL_RACH(L1CTL, ho_ref, chan_nr := g_pars.chan_nr);