stp: Improve failure teardown using Misc_Helpers.f_shutdown

Change-Id: I776bc32b1bdb52d7e90102c4ab6ff7b0ef7a12c6
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 18 insertions(+), 24 deletions(-)


git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/39298/1

diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 2cac7cc..52cbf7d 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -133,16 +133,14 @@
 
 private function f_m3ua_cli_config(integer idx) return M3uaConfig {
 	if (idx < 0 or idx >= NR_M3UA) {
-		setverdict(fail, "f_m3ua_cli_config(): unexpected idx");
-		Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_cli_config(): unexpected idx");
 	}
 	return mp_m3ua_configs[idx];
 }
 
 private function f_m3ua_srv_config(integer idx) return M3uaConfig {
 	if (idx < 0 or idx >= NR_M3UA_SRV) {
-		setverdict(fail, "f_m3ua_srv_config(): unexpected idx");
-		Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_srv_config(): unexpected idx");
 	}
 	return mp_m3ua_configs[M3UA_SRV(idx)];
 }
@@ -188,13 +186,13 @@
 		setverdict(pass);
 		}
 	[] M3UA[idx].receive(t_M3UA_RecvFrom(?)) -> value rx {
-		setverdict(fail, "Received unexpected M3UA[", idx, "] ", rx,
-			   "while waiting for ", msg);
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					log2str("Received unexpected M3UA[", idx, "] ", rx,
+						"while waiting for ", msg));
 		}
 	[] T.timeout {
-		setverdict(fail, "Timeout waiting for M3UA[", idx, "] ", msg);
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					log2str("Timeout waiting for M3UA[", idx, "] ", msg));
 		}
 	}
 }
@@ -237,9 +235,9 @@
 	var M3uaConfig m3cfg := mp_m3ua_configs[i];
 
 	if (lengthof(mp_local_m3ua_ip) == 0 or lengthof(mp_stp_m3ua_ip) == 0) {
-		setverdict(fail, "Empty local or remote address trying to connect SCTP socket: ",
-			   mp_local_m3ua_ip, " / ", mp_stp_m3ua_ip);
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+			log2str("Empty local or remote address trying to connect SCTP socket: ",
+				mp_local_m3ua_ip, " / ", mp_stp_m3ua_ip));
 	}
 
 	if (lengthof(mp_local_m3ua_ip) > 1) {
@@ -262,8 +260,7 @@
 						       {sctp:=valueof(ts_SCTP(3, 0, opt_add_remote_addrs))},
 						       opt_list);
 	if (not ispresent(res.connId)) {
-		setverdict(fail, "Could not connect M3UA socket, check your configuration");
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect M3UA socket, check your configuration");
 	}
 	g_m3ua_conn_id[i] := res.connId;
 }
@@ -273,17 +270,16 @@
 	var Result res;
 
 	if (lengthof(mp_local_m3ua_ip) == 0 or lengthof(mp_stp_m3ua_ip) == 0) {
-		setverdict(fail, "Empty local or remote address trying to connect TCP socket: ",
-			   mp_local_m3ua_ip, " / ", mp_stp_m3ua_ip);
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+			log2str("Empty local or remote address trying to connect TCP socket: ",
+				mp_local_m3ua_ip, " / ", mp_stp_m3ua_ip));
 	}
 
 	res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_port,
 						       mp_local_m3ua_ip[0], m3cfg.local_port, 0,
 						       {tcp:={}});
 	if (not ispresent(res.connId)) {
-		setverdict(fail, "Could not connect M3UA socket, check your configuration");
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect M3UA socket, check your configuration");
 	}
 	g_m3ua_conn_id[i] := res.connId;
 	M3UA_CodecPort.f_set_tcp_segmentation(M3UA[i], res.connId);
@@ -311,9 +307,8 @@
 	var M3uaConfig m3cfg := mp_m3ua_configs[i];
 
 	if (lengthof(mp_local_m3ua_ip) == 0 ) {
-		setverdict(fail, "Empty local address trying to bind SCTP socket: ",
-			   mp_local_m3ua_ip);
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+			log2str("Empty local address trying to bind SCTP socket: ", mp_local_m3ua_ip));
 	}
 
 	if (lengthof(mp_local_m3ua_ip) > 1) {
@@ -330,8 +325,7 @@
 							      {sctp:=valueof(ts_SCTP)}, opt_list);
 	}
 	if (not ispresent(res.connId)) {
-		setverdict(fail, "Could not bind M3UA socket, check your configuration");
-		mtc.stop;
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not bind M3UA socket, check your configuration");
 	}
 	if (m3cfg.use_tcp) {
 		M3UA_CodecPort.f_set_tcp_segmentation(M3UA[i], res.connId);

