summaryrefslogtreecommitdiffstats
path: root/openbsc/tests
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-02-03 19:45:46 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-02-06 13:22:24 +0100
commitca69b0f68d748e56eecd14d1c1a754971e9240ba (patch)
tree89a0b19720e68c8233faaa31f0c6ada6445ff102 /openbsc/tests
parent277b71e0d8b7a8c53599546b0d06ae3810a290eb (diff)
Revert "gprs: Block other GSUP procedures during PURGE_MS"
This reverts commit f81cacc6814dde73f203d125b0065d1451a98317. Since the PURGE MS retry mechanism had been removed, this feature is not used anymore. It just makes the code more complex. Conflicts: openbsc/include/openbsc/gprs_sgsn.h openbsc/src/gprs/gprs_subscriber.c openbsc/tests/sgsn/sgsn_test.c
Diffstat (limited to 'openbsc/tests')
-rw-r--r--openbsc/tests/sgsn/sgsn_test.c83
-rw-r--r--openbsc/tests/sgsn/sgsn_test.ok1
2 files changed, 0 insertions, 84 deletions
diff --git a/openbsc/tests/sgsn/sgsn_test.c b/openbsc/tests/sgsn/sgsn_test.c
index d55a0fc..6fc4f99 100644
--- a/openbsc/tests/sgsn/sgsn_test.c
+++ b/openbsc/tests/sgsn/sgsn_test.c
@@ -636,88 +636,6 @@ int my_gprs_gsup_client_send_dummy(struct gprs_gsup_client *gsupc, struct msgb *
return 0;
};
-
-static void test_subscriber_blocking(void)
-{
- struct gsm_subscriber *s1;
- const char *imsi1 = "1234567890";
- struct sgsn_mm_ctx *ctx;
- struct gprs_ra_id raid = { 0, };
- uint32_t local_tlli = 0xffeeddcc;
- int rc;
-
- printf("Testing subcriber procedure blocking\n");
-
- gprs_gsup_client_send_cb = my_gprs_gsup_client_send_dummy;
- sgsn->gsup_client = talloc_zero(tall_bsc_ctx, struct gprs_gsup_client);
-
- /* Check for emptiness */
- OSMO_ASSERT(gprs_subscr_get_by_imsi(imsi1) == NULL);
-
- /* Create a context */
- OSMO_ASSERT(count(gprs_llme_list()) == 0);
- ctx = alloc_mm_ctx(local_tlli, &raid);
- strncpy(ctx->imsi, imsi1, sizeof(ctx->imsi) - 1);
-
- /* Allocate and attach a subscriber */
- s1 = gprs_subscr_get_or_create_by_mmctx(ctx);
- assert_subscr(s1, imsi1);
-
- /* Start SendAuthInfoRequest procedure */
- rc = gprs_subscr_query_auth_info(s1);
- /* Not blocking */
- OSMO_ASSERT(rc == 0);
-
- /* Start UpdateLocation procedure */
- rc = gprs_subscr_location_update(s1);
- /* Blocking */
- OSMO_ASSERT(rc == 0);
-
- /* Start PurgeMS procedure */
- rc = gprs_subscr_purge(s1);
- /* Not blocking */
- OSMO_ASSERT(rc == 0);
- OSMO_ASSERT(s1->sgsn_data->blocked_by == SGSN_SUBSCR_PROC_PURGE);
-
- /* Start PurgeMS procedure (retry) */
- rc = gprs_subscr_purge(s1);
- /* Not blocking */
- OSMO_ASSERT(rc == 0);
-
- /* Start SendAuthInfoRequest procedure */
- rc = gprs_subscr_query_auth_info(s1);
- /* Blocking */
- OSMO_ASSERT(rc == -EAGAIN);
-
- /* Start UpdateLocation procedure */
- rc = gprs_subscr_location_update(s1);
- /* Blocking */
- OSMO_ASSERT(rc == -EAGAIN);
-
- /* Unblock manually (normally done by the caller of gprs_subscr_purge) */
- s1->sgsn_data->blocked_by = SGSN_SUBSCR_PROC_NONE;
-
- /* Start SendAuthInfoRequest procedure */
- rc = gprs_subscr_query_auth_info(s1);
- /* Not blocking */
- OSMO_ASSERT(rc == 0);
-
- /* Start UpdateLocation procedure */
- rc = gprs_subscr_location_update(s1);
- /* Blocking */
- OSMO_ASSERT(rc == 0);
-
- subscr_put(s1);
- sgsn_mm_ctx_cleanup_free(ctx);
-
- assert_no_subscrs();
-
- gprs_gsup_client_send_cb = __real_gprs_gsup_client_send;
- talloc_free(sgsn->gsup_client);
- sgsn->gsup_client = NULL;
-}
-
-
/*
* Test that a GMM Detach will remove the MMCTX and the
* associated LLME.
@@ -2081,7 +1999,6 @@ int main(int argc, char **argv)
test_subscriber();
test_auth_triplets();
test_subscriber_gsup();
- test_subscriber_blocking();
test_gmm_detach();
test_gmm_detach_power_off();
test_gmm_detach_no_mmctx();
diff --git a/openbsc/tests/sgsn/sgsn_test.ok b/openbsc/tests/sgsn/sgsn_test.ok
index bef8c98..7913a39 100644
--- a/openbsc/tests/sgsn/sgsn_test.ok
+++ b/openbsc/tests/sgsn/sgsn_test.ok
@@ -2,7 +2,6 @@ Testing LLME allocations
Testing core subscriber data API
Testing authentication triplet handling
Testing subcriber GSUP handling
-Testing subcriber procedure blocking
Testing GMM detach
Testing GMM detach (power off)
Testing GMM detach (no MMCTX)