Change in osmo-ttcn3-hacks[master]: BTS_Tests/DTX: provide more details in failed verdict message

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20888 )

Change subject: BTS_Tests/DTX: provide more details in failed verdict message
......................................................................

BTS_Tests/DTX: provide more details in failed verdict message

Change-Id: I15f9303e79750c2864b97697b4378f748a1c7246
Related: OS#4801
---
M bts/BTS_Tests.ttcn
1 file changed, 9 insertions(+), 10 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index beea20a..1a659a2 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -6758,9 +6758,9 @@
 				expected_fill_frames := 2;
 
 				if (nfill_frames < expected_fill_frames) {
-					log("received only ", nfill_frames, " out of ",
-					    expected_fill_frames, " expected fill frames");
-					Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Not enough fill frames received");
+					setverdict(fail, "Not enough fill frames received: ",
+						   nfill_frames, " out of ", expected_fill_frames);
+					Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
 				} else {
 					setverdict(pass);
 				}
@@ -6775,12 +6775,11 @@
 						repeat;
 					}
 				}
-				log("Received DTX TCH fill frame with bad frame number: ", fn,
-				    " (mod ", frame_dtx_tchf_mod, ": ", fn mod frame_dtx_tchf_mod, ")",
-				    " (mod ", block_dtx_tchf_mod, ": ", fn mod block_dtx_tchf_mod, ")");
+				setverdict(fail, "Received DTX TCH fill frame with bad frame number: ", fn,
+					   " (mod ", frame_dtx_tchf_mod, ": ", fn mod frame_dtx_tchf_mod, ")",
+					   " (mod ", block_dtx_tchf_mod, ": ", fn mod block_dtx_tchf_mod, ")");
 				f_rsl_chan_deact();
 				f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
-				Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected L2 fill frame received on Um");
 			}
 		} else {
 			nfill_frames := nfill_frames + 1;
@@ -6807,9 +6806,9 @@
 				if (nfill_frames >= expected_fill_frames) {
 					setverdict(pass);
 				} else {
-					log("received only ", nfill_frames, " out of ",
-					    expected_fill_frames, " expected fill frames");
-					Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Not enough fill frames received");
+					setverdict(fail, "Not enough fill frames received: ",
+						   nfill_frames, " out of ", expected_fill_frames);
+					Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
 				}
 			} else {
 				repeat;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20888
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I15f9303e79750c2864b97697b4378f748a1c7246
Gerrit-Change-Number: 20888
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201102/61820860/attachment.htm>