Change in osmo-mgw[master]: mgcp_test: remove trunk2 from unit-test

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19165 )


Change subject: mgcp_test: remove trunk2 from unit-test
......................................................................

mgcp_test: remove trunk2 from unit-test

Some of the unit-tests initalize a second trunk (trunk2) but the test
never do anything with this trunk. Lets remove it.

Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a
Related: OS#2659
---
M tests/mgcp/mgcp_test.c
1 file changed, 0 insertions(+), 25 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/19165/1

diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index c0e70d3..f934c43 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -761,7 +761,6 @@
 	struct mgcp_config *cfg;
 	struct mgcp_endpoint *endp;
 	struct mgcp_trunk *trunk;
-	struct mgcp_trunk *trunk2;
 	int i;
 	struct mgcp_conn_rtp *conn = NULL;
 	char last_conn_id[256];
@@ -776,9 +775,6 @@
 
 	memset(last_conn_id, 0, sizeof(last_conn_id));
 
-	trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);
-        mgcp_trunk_alloc_endpts(trunk2);
-
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
 		const struct mgcp_test *t = &tests[i];
 		struct msgb *inp;
@@ -895,7 +891,6 @@
 		}
 	}
 
-	mgcp_endpoints_release(trunk2);
 	mgcp_endpoints_release(trunk);
 	talloc_free(cfg);
 }
@@ -904,7 +899,6 @@
 {
 	struct mgcp_config *cfg;
 	struct mgcp_trunk *trunk;
-	struct mgcp_trunk *trunk2;
 	int i;
 	char last_conn_id[256];
 	int rc;
@@ -917,9 +911,6 @@
 
 	memset(last_conn_id, 0, sizeof(last_conn_id));
 
-	trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);
-        mgcp_trunk_alloc_endpts(trunk2);
-
 	for (i = 0; i < ARRAY_SIZE(retransmit); i++) {
 		const struct mgcp_test *t = &retransmit[i];
 		struct msgb *inp;
@@ -958,7 +949,6 @@
 		msgb_free(msg);
 	}
 
-	mgcp_endpoints_release(trunk2);
 	mgcp_endpoints_release(trunk);
 	talloc_free(cfg);
 }
@@ -974,7 +964,6 @@
 {
 	struct mgcp_config *cfg;
 	struct mgcp_trunk *trunk;
-	struct mgcp_trunk *trunk2;
 	struct msgb *inp, *msg;
 	char conn_id[256];
 
@@ -985,9 +974,6 @@
 	trunk->virtual.vty_number_endpoints = 64;
         mgcp_trunk_alloc_endpts(trunk);
 
-	trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);
-        mgcp_trunk_alloc_endpts(trunk2);
-
 	inp = create_msg(CRCX, NULL);
 	msg = mgcp_handle_message(cfg, inp);
 	OSMO_ASSERT(msg);
@@ -1015,7 +1001,6 @@
 	inp = create_msg(DLCX, conn_id);
 	msgb_free(mgcp_handle_message(cfg, inp));
 	msgb_free(inp);
-	mgcp_endpoints_release(trunk2);
 	mgcp_endpoints_release(trunk);
 	talloc_free(cfg);
 }
@@ -1383,7 +1368,6 @@
 {
 	struct mgcp_config *cfg;
 	struct mgcp_trunk *trunk;
-	struct mgcp_trunk *trunk2;
 	struct mgcp_endpoint *endp;
 	struct msgb *inp, *resp;
 	struct in_addr addr;
@@ -1398,9 +1382,6 @@
         mgcp_trunk_alloc_endpts(trunk);
 	cfg->policy_cb = mgcp_test_policy_cb;
 
-	trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);
-        mgcp_trunk_alloc_endpts(trunk2);
-
 	/* Allocate endpoint 1 at mgw with two codecs */
 	last_endpoint[0] = '\0';
 	inp = create_msg(CRCX_MULT_1, NULL);
@@ -1523,7 +1504,6 @@
 	OSMO_ASSERT(conn);
 	OSMO_ASSERT(conn->end.codec->payload_type == 0);
 
-	mgcp_endpoints_release(trunk2);
 	mgcp_endpoints_release(trunk);
 	talloc_free(cfg);
 }
@@ -1582,7 +1562,6 @@
 static void test_no_name(void)
 {
 	struct mgcp_trunk *trunk;
-	struct mgcp_trunk *trunk2;
 	struct mgcp_config *cfg;
 	struct msgb *inp, *msg;
 
@@ -1596,9 +1575,6 @@
 
 	cfg->policy_cb = mgcp_test_policy_cb;
 
-	trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);
-        mgcp_trunk_alloc_endpts(trunk2);
-
 	inp = create_msg(CRCX, NULL);
 	msg = mgcp_handle_message(cfg, inp);
 
@@ -1610,7 +1586,6 @@
 	msgb_free(inp);
 	msgb_free(msg);
 
-	mgcp_endpoints_release(trunk2);
 	mgcp_endpoints_release(trunk);
 	talloc_free(cfg);
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19165
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a
Gerrit-Change-Number: 19165
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200706/150721c6/attachment.htm>