Change in osmo-ttcn3-hacks[master]: pcu: Fix race condition in TC_n3101_max_t3169 and TC_n3103_max_t3169

[pespin]

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

Change subject: pcu: Fix race condition in TC_n3101_max_t3169 and TC_n3103_max_t3169
......................................................................

pcu: Fix race condition in TC_n3101_max_t3169 and TC_n3103_max_t3169

I cannot reproduce the issue in my local system with docker, probabluy
due to different performance from jenkins builder. It triggers almost
every time in jenkins nightly TTCN3 PCU_tests though.
A similar fix was already introduced recently for TC_n3105_max_t3195
since PCU started submitting empty (idle) blocks when there's no TBF
listening on that PDCH. We need to update the test to account for that,
since our TTCN3 timers are not necessarily exactly matching the one at
the PCU side.

Change-Id: Ia5344df15c612c70a6cdd7bb6f12dc7524a23bf4
---
M pcu/PCU_Tests.ttcn
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved



diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index c347761..5bc2959 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -1524,6 +1524,9 @@
 					  block_nr := nr.blk_nr));
 		repeat;
 	}
+	/* We may already receive empty (idle) blocks before our own TTCN3 timer
+	 * triggers due to the TBF being released. Keep going until our T_3169 triggers. */
+	[mp_osmo_pcu_newer_than_0_9_0 and n3101 == N3101_MAX + 1] as_pcuif_rx_ignore_empty(nr);
 	[] T_3169.timeout {
 		log("T_3169 expired");
 		/* Done in alt */
@@ -1622,6 +1625,7 @@
 		f_shutdown(__BFILE__, __LINE__);
 	}
 	[] as_ms_rx_ignore_dummy(ms, nr);
+	[] as_pcuif_rx_ignore_empty(nr);
 	[T_3169.running] T_3169.timeout {
 		log("T_3169 timeout");
 		/* Done in alt, wait for pending RTS initiated previously in

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26221
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: Ia5344df15c612c70a6cdd7bb6f12dc7524a23bf4
Gerrit-Change-Number: 26221
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
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/20211115/48216776/attachment.htm>