pespin submitted this change.

View Change

Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved
stp: STP_Tests_IPA.TC_tmt_loadshare_sls: Fix test expectancies

Change-Id: I68856e11a92b707eb11ab4813390e6faf3c54b69
---
M stp/STP_Tests_IPA.ttcn
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 088b280..88c9312 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -304,9 +304,14 @@
}
}

- /* All traffic should have still be sent to the first receiver, since OPC+SLS cannot change in IPA ASPs. */
- if (num_rx_1 != iter_per_asp and num_rx_2 != 0) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through 1st receiver!");
+ /* All traffic should not still be sent to the same receiver, since
+ * OPC+SLS cannot change in IPA ASPs.
+ * However, depending on how the SLS seed tables were allocated, it can
+ * be that STP was routing through Alternative Route and now that the
+ * 2nd receiver is up it is now routing to it (Normal Route). Account
+ * for both scenarios. */
+ if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 == iter_per_asp and num_rx_1 == 0))) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through same receiver!");
}



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

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I68856e11a92b707eb11ab4813390e6faf3c54b69
Gerrit-Change-Number: 39765
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>