fixeria submitted this change.

View Change


Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified
tests/iuup: fix assert()s in test_decode_passive_init_2_rfci_no_iptis()

We should not be doing the actual logic inside the assert statements.

Change-Id: I3bbf4e602c25c5aaced609e9834d6b053688194d
Fixes: CID#274664, CID#274679
---
M tests/iuup/iuup_test.c
1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c
index e40b9e7..f3aba66 100644
--- a/tests/iuup/iuup_test.c
+++ b/tests/iuup/iuup_test.c
@@ -727,14 +727,18 @@
rnp = osmo_iuup_rnl_prim_alloc(iuup_test_ctx, OSMO_IUUP_RNL_CONFIG, PRIM_OP_REQUEST, IUUP_MSGB_SIZE);
rnp->u.config = def_configure_req;
rnp->u.config.active = false;
- OSMO_ASSERT((rc = osmo_iuup_rnl_prim_down(iui, rnp)) == 0);
+
+ rc = osmo_iuup_rnl_prim_down(iui, rnp);
+ OSMO_ASSERT(rc == 0);

/* Send Init: */
tnp = osmo_iuup_tnl_prim_alloc(iuup_test_ctx, OSMO_IUUP_TNL_UNITDATA, PRIM_OP_INDICATION, IUUP_MSGB_SIZE);
tnp->oph.msg->l2h = msgb_put(tnp->oph.msg, sizeof(iuup_init));
hdr14 = (struct iuup_pdutype14_hdr *)msgb_l2(tnp->oph.msg);
memcpy(hdr14, iuup_init, sizeof(iuup_init));
- OSMO_ASSERT((rc = osmo_iuup_tnl_prim_up(iui, tnp)) == 0);
+
+ rc = osmo_iuup_tnl_prim_up(iui, tnp);
+ OSMO_ASSERT(rc == 0);

osmo_iuup_instance_free(iui);
}

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I3bbf4e602c25c5aaced609e9834d6b053688194d
Gerrit-Change-Number: 35325
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged