From 02c086f403ce35a8888333eb3fde6ffc5fe03544 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 22 Sep 2023 15:32:41 +0700 Subject: [PATCH] BSC_Tests: drop f_osmo_repo_is() check in TC_assignment_csd Change-Id: I38093d8ff4db9a726e8494161d0074d4b881054f --- bsc/BSC_Tests.ttcn | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f2f7f5b8e..7773153a8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1895,23 +1895,16 @@ private function f_tc_assignment_csd_all(charstring id) runs on MSC_ConnHdlr { f_tc_assignment_csd("NT_6k0", GSM0808_DATA_RATE_NON_TRANSP_6k0, false); } testcase TC_assignment_csd() runs on test_CT { - if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.10.0 */ - var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); + + f_init(1, true, guard_timeout := 120.0); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_csd_all), pars); + vc_conn.done; - f_init(1, true, guard_timeout := 120.0); - f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_csd_all), pars); - vc_conn.done; - } else { - var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var PDU_BSSAP ass_cmd := f_gen_ass_req(); - ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); - //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); - var DchanTuple dt := f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); - f_perform_clear_test_ct(dt); - } f_shutdown_helper(); }