fixeria submitted this change.

View Change

Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified
pcu: fix TC_n3103_max_t3169 and TC_n3105_max_t3195

Both tests rely on [T.running] T.timeout to leave a plain alt.
This worked up to TITAN 11.1.0, but can never match since 11.2.0
re-evaluates guards on each snapshot (see the previous commit and
titan.core 4ca840ba5, #747). The tests then loop on dummy/empty
blocks until T_guard expires. Drop the redundant guards.

Change-Id: I079421b85460c43754c0b5b5e3b8ed92cf95fc31
Fixes: OS#7109
---
M pcu/PCU_Tests.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 98fbbf6..c5db98a 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -1673,7 +1673,7 @@
}
[] as_ms_rx_ignore_dummy(ms, nr);
[] as_pcuif_rx_ignore_empty(nr);
- [T_3169.running] T_3169.timeout {
+ [] T_3169.timeout {
log("T_3169 timeout");
/* Done in alt, wait for pending RTS initiated previously in
* above case before continuing (expect /* Dummy block): */
@@ -2055,7 +2055,7 @@
/* We may already receive idle blocks before our own TTCN3 timer
* triggers due to the TBF being released. Keep going until our T_3195 triggers. */
[N3105 == N3105_MAX] as_pcuif_rx_ignore_empty(nr);
- [T_3195.running] T_3195.timeout {
+ [] T_3195.timeout {
log("T_3195 timeout");
/* Done in alt, wait for pending RTS initiated previously in
* above case before continuing (expect empty block): */

To view, visit change 44067. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I079421b85460c43754c0b5b5e3b8ed92cf95fc31
Gerrit-Change-Number: 44067
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>