From 280536b782396d50f6b6740aaee8f1dc5f64c821 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 28 Jun 2019 11:04:48 +0200 Subject: mgw: add module param mp_enable_conn_timeout_test Fix ttcn3-mgw-latest by not running "conn-timeout 0" during f_init_vty at the start of every test case. The latest osmo-mgw release does not have that command yet. Change-Id: I8bbf15baa45679d5812a5a9184520ef9b9e73bba --- mgw/MGCP_Test.ttcn | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index aeb6ef86..7ddb6ea6 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -69,6 +69,10 @@ module MGCP_Test { charstring mp_remote_ip := "127.0.0.1"; PortNumber mp_local_rtp_port_base := 10000; PortNumber mp_local_osmux_port := 1985; + + /* Whether to enable conn-timeout tests. Can be dropped completely and enabled unconditionally once new + * version of osmo-mgw is released (current version: 1.5.0) */ + boolean mp_enable_conn_timeout_test := true; } private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT { @@ -91,7 +95,9 @@ module MGCP_Test { f_vty_transceive(MGWVTY, "enable"); f_vty_enable_osmux(osmux_on); - f_vty_config(MGWVTY, "mgcp", "conn-timeout 0"); + if (mp_enable_conn_timeout_test) { + f_vty_config(MGWVTY, "mgcp", "conn-timeout 0"); + } } private function f_rtpem_init(inout RTP_Emulation_CT comp_ref, integer i) @@ -2158,6 +2164,8 @@ module MGCP_Test { execute(TC_amr_oa_oa_rtp_conversion()); execute(TC_amr_bwe_bwe_rtp_conversion()); - execute(TC_conn_timeout()); + if (mp_enable_conn_timeout_test) { + execute(TC_conn_timeout()); + } } } -- cgit v1.2.3