aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2022-04-12 01:44:43 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2022-04-12 01:53:00 +0200
commit2677b879783bb761952e88f7166363c4ce7e6907 (patch)
treea794b494a2e8b18d18f809d69e704f7f54dcf2c0
parent5b0327b20af9da895bff3035837de4da5c4da9bd (diff)
bsc: fix sccplite test fallout: deactivate as_Media in f_ho_into_this_bsc()
Deactivate as_Media() once the handover is completed, so that it does not fail on the expected MGCP DLCX from release. Fix fallout seen in these tests: SCCPlite BSC_Tests.TC_ho_into_this_bsc BSC_Tests.TC_ho_into_this_bsc_a5_0 BSC_Tests.TC_ho_into_this_bsc_a5_1 BSC_Tests.TC_ho_into_this_bsc_a5_3 BSC_Tests.TC_ho_into_this_bsc_a5_4 BSC_Tests.TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg BSC_Tests.TC_ho_into_this_bsc_a5_1_3 BSC_Tests.TC_srvcc_eutran_to_geran BSC_Tests.TC_srvcc_eutran_to_geran_a5_3 BSC_Tests.TC_srvcc_eutran_to_geran_src_sai BSC_Tests.TC_srvcc_eutran_to_geran_forbid_fast_return BSC_Tests.TC_ho_into_this_bsc_sccp_cr_without_bssap All of these tests use f_ho_into_this_bsc(). (It is not clear to me why only the SCCPlite tests show the fallout, the AoIP should be similarly affected, but isn't.) The failures were introduced by recent merge of I0633f60f09d58802f6be0238ef41a632d93a4327, which made as_Media() stricter by failing on early DLCX. Related: SYS#5916 Change-Id: Ic5650a48eb3d90f2b42f16685178c97b54473429
-rw-r--r--bsc/BSC_Tests.ttcn3
1 files changed, 2 insertions, 1 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index a2add34f..3a40d8da 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -5997,7 +5997,7 @@ private function f_ho_into_this_bsc(charstring id, template (omit) BSSMAP_oldToN
f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit});
f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);
- activate(as_Media());
+ var default as_media := activate(as_Media());
var PDU_BSSAP ho_req := f_gen_handover_req(aoip_tla := g_pars.host_aoip_tla,
cell_id_source := g_pars.cell_id_source,
@@ -6130,6 +6130,7 @@ private function f_ho_into_this_bsc(charstring id, template (omit) BSSMAP_oldToN
enc_PDU_ML3_MS_NW(l3_tx)));
BSSAP.receive(tr_BSSMAP_HandoverComplete);
+ deactivate(as_media);
setverdict(pass);
}