Osmocom_CTRL: Fix matching on incoming trap; avoid generating error verdicts in functions
diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn
index a9fccb9..b8e68e3 100644
--- a/library/Osmocom_CTRL_Functions.ttcn
+++ b/library/Osmocom_CTRL_Functions.ttcn
@@ -14,13 +14,16 @@
pt.send(ts_CtrlMsgGet(id, variable));
T.start;
alt {
- [] pt.receive(tr_CtrlMsgGetRepl(id, variable)) -> value rx { }
+ [] pt.receive(tr_CtrlMsgGetRepl(id, variable)) -> value rx {
+ }
[] pt.receive(tr_CtrlMsgTrap) { repeat; }
[] pt.receive(tr_CtrlMsgError) -> value rx {
setverdict(fail, "Error in CTRL GET ", variable, ": ", rx.err.reason);
+ return "FAIL";
}
[] T.timeout {
setverdict(fail, "Timeout waiting for CTRL GET REPLY ", variable);
+ return "TIMEOUT";
}
}
return rx.resp.val;
@@ -52,9 +55,11 @@
var CtrlMessage rx;
T.start;
alt {
- [] pt.receive(tr_CtrlMsgTrap(variable, val)) -> value rx {}
+ [] pt.receive(tr_CtrlMsgTrap(variable, val)) -> value rx {
+ }
[] T.timeout {
setverdict(fail, "Timeout waiting for TRAP ", variable);
+ return "TIMEOUT";
}
}
return rx.trap.val;