pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41572?usp=email )
Change subject: msc: Adapt testsuite to new OsmoCNI 202512 release ......................................................................
msc: Adapt testsuite to new OsmoCNI 202512 release
Change-Id: I9a393457eb5e57ca0a3f836b2c0366451c795097 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn 3 files changed, 5 insertions(+), 18 deletions(-)
Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index dd285dd..98c9dce 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1131,9 +1131,7 @@ cpars.got_osmux_count := 0;
/* MS <- MSC: Expect CC SETUP */ - /* Remove 'or Misc_Helpers.f_osmo_repo_is("latest")' after osmo-msc - * 1.15.0 is released with I7046e9244fd9d4301ee2c4df1147a619f753739c */ - if (cpars.csd or Misc_Helpers.f_osmo_repo_is("latest")) { + if (cpars.csd) { RAN_CONN.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_SETUP(cpars.transaction_id, *, cpars.called_party, *))); } else { /* Speech: check bearer capabilities against ts_Bcap_voice_mt diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 635e04f..013ecfd 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -8000,12 +8000,7 @@
execute( TC_lu_and_mo_call_reass_for_mt_codec() );
- /* This "nightly" if can be removed once libosmo-sigtran (osmo-stp) > 2.1.0 is released. - * Currently released osmo-stp 2.1.0 ends up in in broken AS-ACTIVE+ASP-DOWN state when - * restarting the ASP after exiting the related asp node through VTY: */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_stat_bsc_sctp_disconnected() ); - } + execute( TC_stat_bsc_sctp_disconnected() );
execute( TC_silent_call_start_stop() ); execute( TC_silent_call_active_conn() ); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 75ecbe3..6c96041 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -712,17 +712,11 @@ execute( TC_iu_lu_with_invalid_mcc_mnc() ); execute( TC_iu_lu_and_expire_while_paging() );
- /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ - - /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_mo_cc_iu_release() );
- /* This "nightly" if can be removed once libosmo-sigtran (osmo-stp) > 2.1.0 is released. - * Currently released osmo-stp 2.1.0 ends up in in broken AS-ACTIVE+ASP-DOWN state when - * restarting the ASP after exiting the related asp node through VTY: */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_stat_rnc_sctp_disconnected() ); - } + execute( TC_stat_rnc_sctp_disconnected() ); + + /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ }