bsc: f_expect_dlcx_conns(): do not rx Clear Complete

The function f_expect_dlcx_conns() is clearly related to MGCP, and
semantically should not interfere with BSSAP by also receiving the Clear
Complete.

For some tests, this incidentally makes sense, but an upcoming test
failed in a non-obvious way because of this.

Related: SYS#5130
Change-Id: I637414f4db8ea7c4b59aaee205d65926574b5ccd
This commit is contained in:
Neels Hofmeyr 2021-07-22 16:12:57 +02:00 committed by laforge
parent e680b01650
commit 8fcd8774cd
1 changed files with 10 additions and 2 deletions

View File

@ -5106,8 +5106,6 @@ private function f_expect_dlcx_conns() runs on MSC_ConnHdlr {
MGCP_MULTI.send(t_MGCP_SendToMrf(mrf, msg_resp));
};
}
BSSAP.receive(tr_BSSMAP_ClearComplete);
}
private function f_ho_out_of_this_bsc(template (omit) BSSMAP_oldToNewBSSIEs exp_oldToNewBSSIEs := omit) runs on MSC_ConnHdlr {
@ -5160,6 +5158,7 @@ private function f_ho_out_of_this_bsc(template (omit) BSSMAP_oldToNewBSSIEs exp_
[] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE));
[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr));
[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr));
[] BSSAP.receive(tr_BSSMAP_ClearComplete);
}
setverdict(pass);
}
@ -5433,6 +5432,7 @@ private function f_tc_ho_out_fail_no_result_after_ho_cmd(charstring id) runs on
}
f_expect_dlcx_conns();
BSSAP.receive(tr_BSSMAP_ClearComplete);
setverdict(pass);
f_sleep(1.0);
@ -5743,6 +5743,8 @@ private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr
BSSAP.send(ts_BSSMAP_ClearCommand(cause));
f_expect_dlcx_conns();
BSSAP.receive(tr_BSSMAP_ClearComplete);
setverdict(pass);
f_sleep(1.0);
@ -5834,6 +5836,8 @@ private function f_tc_ho_in_fail_msc_clears_after_ho_detect(charstring id) runs
BSSAP.send(ts_BSSMAP_ClearCommand(cause));
f_expect_dlcx_conns();
BSSAP.receive(tr_BSSMAP_ClearComplete);
f_sleep(1.0);
}
testcase TC_ho_in_fail_msc_clears_after_ho_detect() runs on test_CT {
@ -5921,6 +5925,8 @@ private function f_tc_ho_in_fail_no_detect(charstring id) runs on MSC_ConnHdlr {
BSSAP.send(ts_BSSMAP_ClearCommand(cause));
f_expect_dlcx_conns();
BSSAP.receive(tr_BSSMAP_ClearComplete);
f_sleep(1.0);
}
testcase TC_ho_in_fail_no_detect() runs on test_CT {
@ -6000,6 +6006,8 @@ private function f_tc_ho_in_fail_no_detect2(charstring id) runs on MSC_ConnHdlr
BSSAP.send(ts_BSSMAP_ClearCommand(cause));
};
f_expect_dlcx_conns();
BSSAP.receive(tr_BSSMAP_ClearComplete);
f_sleep(1.0);
}
testcase TC_ho_in_fail_no_detect2() runs on test_CT {