Change in osmo-ttcn3-hacks[master]: CTRL funcs: on rate counter mismatch, show all mismatches

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19903 )


Change subject: CTRL funcs: on rate counter mismatch, show all mismatches
......................................................................

CTRL funcs: on rate counter mismatch, show all mismatches

When rate counters have unexpected counts, show all mismatches instead of just
the first mismatch. That saves many iterations when fixing rate counter
expectations.

Change-Id: I70b319adcecc3ff7a85a0206b8dc2285133943c1
---
M library/Osmocom_CTRL_Functions.ttcn
1 file changed, 9 insertions(+), 2 deletions(-)



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

diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn
index d26dc89..73fd05b 100644
--- a/library/Osmocom_CTRL_Functions.ttcn
+++ b/library/Osmocom_CTRL_Functions.ttcn
@@ -249,16 +249,23 @@
 	function f_counter_name_vals_expect(IPA_CTRL_PT pt, charstring instance_name, integer instance_nr,
 					    CounterNameVals vals) {
 		var CounterNameVals now := f_counter_name_vals_get(pt, instance_name, instance_nr, vals);
+		var boolean all_match := true;
 		for (var integer i := 0; i < lengthof(vals); i := i + 1) {
 			if (now[i].name != vals[i].name) {
 				setverdict(fail, "Internal error");
 			}
 			if (now[i].val != vals[i].val) {
-				setverdict(fail, "Rate counter mismatch: ", instance_name, " ", instance_nr,
+				all_match := false;
+				log("Rate counter mismatch: ", instance_name, " ", instance_nr,
 					   " ", vals[i].name, " is at ", now[i].val, " but expected ", vals[i].val);
 			}
 		}
-		setverdict(pass);
+
+		if (all_match) {
+			setverdict(pass);
+		} else {
+			setverdict(fail, "Rate counter mismatch, see log");
+		}
 	}
 
 	/* For N instances, call f_counter_name_vals_get() and compare with expected counter values.

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19903
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: I70b319adcecc3ff7a85a0206b8dc2285133943c1
Gerrit-Change-Number: 19903
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200830/a1ecf4f5/attachment.htm>