Change in ...osmo-msc[master]: tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear()

laforge gerrit-no-reply at lists.osmocom.org
Wed Jun 19 16:57:21 UTC 2019


laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/14514 )

Change subject: tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear()
......................................................................

tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear()

The function name implies OSMO_RAT_GERAN_A, and it has nothing
to do with other OSMO_RAT_* types. Found using clang:

  warning: too many arguments in call to 'expect_bssap_clear'
           expect_bssap_clear(OSMO_RAT_GERAN_A);
	                      ^^^^^^^^^^^^^^^^

Change-Id: Id3a3af33fcc5da4ca4c48a2f589a69f3568d2586
---
M tests/msc_vlr/msc_vlr_test_gsm_authen.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.c
M tests/msc_vlr/msc_vlr_test_no_authen.c
M tests/msc_vlr/msc_vlr_test_reject_concurrency.c
4 files changed, 11 insertions(+), 11 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 8776e03..ee5af1e 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -113,7 +113,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
@@ -327,7 +327,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
@@ -1017,7 +1017,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index c76cba4..155afbe 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -128,7 +128,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
@@ -363,7 +363,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
@@ -967,7 +967,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
@@ -1158,7 +1158,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
@@ -1375,7 +1375,7 @@
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c
index ae77252..9d506d6 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -69,7 +69,7 @@
 	EXPECT_ACCEPTED(true);
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
@@ -227,7 +227,7 @@
 	EXPECT_ACCEPTED(true);
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
index fe53469..648313f 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
@@ -308,7 +308,7 @@
 	BTW("The original CM Service Request can conclude");
 
 	/* Release connection */
-	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	expect_bssap_clear();
 	conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
 
 	btw("all requests serviced, conn has been released");

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Id3a3af33fcc5da4ca4c48a2f589a69f3568d2586
Gerrit-Change-Number: 14514
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190619/5b737282/attachment.html>


More information about the gerrit-log mailing list