summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-03-21 11:26:23 +0100
committerHarald Welte <laforge@gnumonks.org>2018-03-21 11:27:48 +0100
commit458fd37fb94cc34986719a0e5b52f552d9d34e27 (patch)
tree8025c13155b06fd37421f6f0ea9e32040a51d132
parent61c11e9234b3f9e087aba94380892ab66abc1191 (diff)
don't use setverdict(inconc) anymore. Use 'fail' at all times
The problem is that Junit-XML doesn't have a mapping for inconclusive results, and hence they show up as 'passed'. By introducing this change, we make sure all tests that don't pass show up as failed. Change-Id: Iddd13d0055c91f9bd304ce9833fba0485abf4c4e
-rw-r--r--bsc-nat/MSC_ConnectionHandler.ttcn2
-rw-r--r--bsc/BSC_Tests.ttcn2
-rw-r--r--bsc/MSC_ConnectionHandler.ttcn2
-rw-r--r--msc/MSC_Tests.ttcn6
4 files changed, 6 insertions, 6 deletions
diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn
index 0a06759..102869c 100644
--- a/bsc-nat/MSC_ConnectionHandler.ttcn
+++ b/bsc-nat/MSC_ConnectionHandler.ttcn
@@ -146,7 +146,7 @@ function main(integer connection_id, integer e1_timeslot) runs on MSC_ConnHdlr {
/* Guard timer has expired, close connection */
[] T.timeout {
BSSAP.send(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
- setverdict(inconc);
+ setverdict(fail, "Timeout of guard timer");
self.stop;
}
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index aff6336..ea90f06 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1674,7 +1674,7 @@ private function f_tc_err_84_unknown_msg(charstring id) runs on MSC_ConnHdlr {
setverdict(pass);
}
[] BSSAP.receive { setverdict(fail, "unexpected BSSAP"); }
- [] T.timeout { setverdict(inconc); }
+ [] T.timeout { setverdict(fail, "Timeout waiting for RR STATUS"); }
}
}
testcase TC_err_84_unknown_msg() runs on test_CT {
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 62c2a71..7c5a6d7 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -682,7 +682,7 @@ runs on MSC_ConnHdlr return PDU_BSSAP {
setverdict(fail, "Received non-matching ASSIGNMENT FAIL");
}
[] T.timeout {
- setverdict(inconc, "Timeout waiting for ASSIGNMENT COMPLETE");
+ setverdict(fail, "Timeout waiting for ASSIGNMENT COMPLETE");
}
}
log("g_media ", g_media);
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 5ae5d60..84f33b7 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -161,7 +161,7 @@ function f_init_gsup(charstring id) runs on MTC_CT {
alt {
[] GSUP_IPA_EVENT.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP)) { }
[] T.timeout {
- setverdict(inconc, "No connection to GSUP Port");
+ setverdict(fail, "No connection to GSUP Port");
self.stop
}
}
@@ -1511,7 +1511,7 @@ private function f_tc_lu_imsi_auth_tmsi_encr_3_1(charstring id, BSC_ConnHdlrPars
self.stop;
}
[] BSSAP.receive {
- setverdict(inconc, "Unknown/unexpected BSSAP received");
+ setverdict(fail, "Unknown/unexpected BSSAP received");
self.stop;
}
}
@@ -1578,7 +1578,7 @@ private function f_tc_lu_imsi_auth_tmsi_encr_13_2(charstring id, BSC_ConnHdlrPar
self.stop;
}
[] BSSAP.receive {
- setverdict(inconc, "Unknown/unexpected BSSAP received");
+ setverdict(fail, "Unknown/unexpected BSSAP received");
self.stop;
}
}