msc: Enable/disable osmux always based on test
Initially it was thought safe to only enable it since the osmux test was
at the end, but actually IU tests run after it, and those don't expect
osmux to be enabled.
This way we also always match osmo-msc osmux state with whatever the
test expects (and sets through f_init()).
Change-Id: I8fb48af7d37f1a2391a39c19f5ec5064cd5869d2
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 16f7b9b..40e0720 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -330,6 +330,11 @@
f_vty_config(MSCVTY, "network", "authentication optional");
f_vty_config(MSCVTY, "msc", "assign-tmsi");
f_vty_config(MSCVTY, "network", "encryption a5 0");
+ if (osmux) {
+ f_vty_config(MSCVTY, "msc", "osmux on");
+ } else {
+ f_vty_config(MSCVTY, "msc", "osmux off");
+ }
}
/* Initialize for a direct connection to BSSAP. This function is an alternative
@@ -1746,7 +1751,6 @@
testcase TC_lu_and_mt_call_osmux() runs on MTC_CT {
var BSC_ConnHdlr vc_conn;
f_init(1, false, true, true);
- f_vty_config(MSCVTY, "msc", "osmux on");
vc_conn := f_start_handler(refers(f_tc_lu_and_mt_call), 39, 0, true, true);
vc_conn.done;