library: Ensure setverdict(fail) is followed by mtc.stop
This will prevent subsequent failures from overwriting the verdict so we
can easily see the root cause of the test failure.
Using testcase.stop instead for errors internal to our test
infrastructure to mark them as test errors instead of failed.
Change-Id: Idc6819aaf0b01e70c38fad828dd44dcec6bdd778
diff --git a/library/SMPP_Emulation.ttcn b/library/SMPP_Emulation.ttcn
index 27876dc..6dc78e9 100644
--- a/library/SMPP_Emulation.ttcn
+++ b/library/SMPP_Emulation.ttcn
@@ -88,7 +88,7 @@
}
}
setverdict(fail, "No componten for SMPP TID ", tid);
- self.stop;
+ mtc.stop;
}
@@ -109,8 +109,7 @@
return;
}
}
- setverdict(fail, "SMPP Trans table full!");
- self.stop;
+ testcase.stop("SMPP Trans table full!");
}
private function f_trans_table_del(uint32_t trans_id)
@@ -123,7 +122,7 @@
}
}
setverdict(fail, "SMPP Trans table attempt to delete non-existant ", trans_id);
- self.stop;
+ mtc.stop;
}
@@ -136,7 +135,7 @@
local_host, local_port, 0, { tcp :={} });
if (not ispresent(res.connId)) {
setverdict(fail, "Could not connect to SMPP port, check your configuration");
- self.stop;
+ mtc.stop;
}
g_smpp_conn_id := res.connId;
}
@@ -187,7 +186,7 @@
[] SMPP_PORT.receive(tr_SMPP_Recv(g_smpp_conn_id, pdu)) { }
[] T_wait.timeout {
setverdict(fail, "Timeout waiting for ", pdu);
- self.stop;
+ mtc.stop;
}
}
}
@@ -211,7 +210,7 @@
}
[] SMPP_PORT.receive {
setverdict(fail, "Unexpected SMPP from peer");
- self.stop;
+ mtc.stop;
}
}
@@ -371,8 +370,7 @@
return;
}
}
- setverdict(fail, "No space left in SmppExpectTable");
- self.stop;
+ testcase.stop("No space left in SmppExpectTable");
}
private function f_exp_lookup(SMPP_TON ton, SMPP_NPI npi, charstring dst)