<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19165">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_test: remove trunk2 from unit-test<br><br>Some of the unit-tests initalize a second trunk (trunk2) but the test<br>never do anything with this trunk. Lets remove it.<br><br>Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a<br>Related: OS#2659<br>---<br>M tests/mgcp/mgcp_test.c<br>1 file changed, 0 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 792ae1f..66f79b0 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -762,7 +762,6 @@</span><br><span> struct mgcp_config *cfg;</span><br><span> struct mgcp_endpoint *endp;</span><br><span> struct mgcp_trunk *trunk;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk *trunk2;</span><br><span> int i;</span><br><span> struct mgcp_conn_rtp *conn = NULL;</span><br><span> char last_conn_id[256];</span><br><span>@@ -777,9 +776,6 @@</span><br><span> </span><br><span> memset(last_conn_id, 0, sizeof(last_conn_id));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_alloc_endpts(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> for (i = 0; i < ARRAY_SIZE(tests); i++) {</span><br><span> const struct mgcp_test *t = &tests[i];</span><br><span> struct msgb *inp;</span><br><span>@@ -896,7 +892,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(trunk2);</span><br><span> mgcp_endpoints_release(trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span>@@ -905,7 +900,6 @@</span><br><span> {</span><br><span> struct mgcp_config *cfg;</span><br><span> struct mgcp_trunk *trunk;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk *trunk2;</span><br><span> int i;</span><br><span> char last_conn_id[256];</span><br><span> int rc;</span><br><span>@@ -918,9 +912,6 @@</span><br><span> </span><br><span> memset(last_conn_id, 0, sizeof(last_conn_id));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_alloc_endpts(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> for (i = 0; i < ARRAY_SIZE(retransmit); i++) {</span><br><span> const struct mgcp_test *t = &retransmit[i];</span><br><span> struct msgb *inp;</span><br><span>@@ -959,7 +950,6 @@</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(trunk2);</span><br><span> mgcp_endpoints_release(trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span>@@ -975,7 +965,6 @@</span><br><span> {</span><br><span> struct mgcp_config *cfg;</span><br><span> struct mgcp_trunk *trunk;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk *trunk2;</span><br><span> struct msgb *inp, *msg;</span><br><span> char conn_id[256];</span><br><span> </span><br><span>@@ -986,9 +975,6 @@</span><br><span> trunk->vty_number_endpoints = 64;</span><br><span> mgcp_trunk_alloc_endpts(trunk);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_alloc_endpts(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> inp = create_msg(CRCX, NULL);</span><br><span> msg = mgcp_handle_message(cfg, inp);</span><br><span> OSMO_ASSERT(msg);</span><br><span>@@ -1016,7 +1002,6 @@</span><br><span> inp = create_msg(DLCX, conn_id);</span><br><span> msgb_free(mgcp_handle_message(cfg, inp));</span><br><span> msgb_free(inp);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(trunk2);</span><br><span> mgcp_endpoints_release(trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span>@@ -1384,7 +1369,6 @@</span><br><span> {</span><br><span> struct mgcp_config *cfg;</span><br><span> struct mgcp_trunk *trunk;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk *trunk2;</span><br><span> struct mgcp_endpoint *endp;</span><br><span> struct msgb *inp, *resp;</span><br><span> struct in_addr addr;</span><br><span>@@ -1399,9 +1383,6 @@</span><br><span> mgcp_trunk_alloc_endpts(trunk);</span><br><span> cfg->policy_cb = mgcp_test_policy_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_alloc_endpts(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Allocate endpoint 1@mgw with two codecs */</span><br><span> last_endpoint[0] = '\0';</span><br><span> inp = create_msg(CRCX_MULT_1, NULL);</span><br><span>@@ -1531,7 +1512,6 @@</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(trunk2);</span><br><span> mgcp_endpoints_release(trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span>@@ -1591,7 +1571,6 @@</span><br><span> static void test_no_name(void)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk *trunk2;</span><br><span> struct mgcp_config *cfg;</span><br><span> struct msgb *inp, *msg;</span><br><span> </span><br><span>@@ -1605,9 +1584,6 @@</span><br><span> </span><br><span> cfg->policy_cb = mgcp_test_policy_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_alloc_endpts(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> inp = create_msg(CRCX, NULL);</span><br><span> msg = mgcp_handle_message(cfg, inp);</span><br><span> </span><br><span>@@ -1619,7 +1595,6 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(trunk2);</span><br><span> mgcp_endpoints_release(trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19165">change 19165</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-mgw/+/19165"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a </div>
<div style="display:none"> Gerrit-Change-Number: 19165 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>