From 4d15fa737911428113f32c076b5ad49fa1099dfd Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 19 Aug 2020 08:58:28 +0200 Subject: msc: Fix repeated execution of TC_sgsap_unsol_ud() Change-Id: I6c2f1a5d5b5316ffe462335f8461c31564ce4274 Closes: OS#4722 --- msc/MSC_Tests.ttcn | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'msc/MSC_Tests.ttcn') diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index bdd9f62f..a801db92 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -962,23 +962,27 @@ testcase TC_lu_by_tmsi_noauth_unknown() runs on MTC_CT { vc_conn.done; } - -/* Test IMSI DETACH (MI=IMSI) */ -friend function f_tc_imsi_detach_by_imsi(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - f_init_handler(pars); - +friend function f_imsi_detach_by_imsi() runs on BSC_ConnHdlr { var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ f_cl3_or_initial_ue(valueof(ts_ML3_MO_MM_IMSI_DET_Ind(mi))); /* Send Early Classmark, just for the fun of it? */ - if (pars.ran_is_geran) { + if (g_pars.ran_is_geran) { BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); } /* wait for normal teardown */ - f_expect_clear(); + f_expect_clear(verify_vlr_cell_id := false); +} + + +/* Test IMSI DETACH (MI=IMSI) */ +friend function f_tc_imsi_detach_by_imsi(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + + f_imsi_detach_by_imsi(); } testcase TC_imsi_detach_by_imsi() runs on MTC_CT { var BSC_ConnHdlr vc_conn; @@ -4831,6 +4835,9 @@ private function f_tc_sgsap_unsol_ud(charstring id, BSC_ConnHdlrPars pars) runs f_sgsap_bssmap_screening(); + /* clean-up VLR state about this subscriber */ + f_imsi_detach_by_imsi(); + setverdict(pass); } testcase TC_sgsap_unsol_ud() runs on MTC_CT { -- cgit v1.2.3