From 292da8695fedbb75bdeb0333c642573b6d08a687 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 29 May 2013 10:00:30 +0200 Subject: test-ippool: Shortcut exhausting allocation test Instead really trying to allocate all possible 69888 blocks, let's reserve the first two IP pools and then we only need to allocate 255 blocks. That should bring down the runtime considerable. --- unit/test-ippool.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/unit/test-ippool.c b/unit/test-ippool.c index 07456d5a..f45c5b96 100644 --- a/unit/test-ippool.c +++ b/unit/test-ippool.c @@ -111,8 +111,6 @@ static void test_case_3(void) __connman_ippool_init(); - /* Allocate all possible pools */ - /* * Number of addresses * 24-bit block 10.0.0.0 – 10.255.255.255 16,777,216 @@ -124,12 +122,18 @@ static void test_case_3(void) * Total numbers of 256 blocks: 69,888 */ + /* + * Completely exhaust the first two pools because they are a bit + * too large. + */ + __connman_ippool_newaddr(45, "10.0.0.1", 8); + __connman_ippool_newaddr(46, "172.16.0.1", 11); + while (TRUE) { pool = __connman_ippool_create(23, 1, 100, NULL, NULL); if (pool == NULL) break; i += 1; - g_assert(i < 69888); list = g_slist_prepend(list, pool); @@ -146,6 +150,8 @@ static void test_case_3(void) g_assert(end_ip); } + g_assert(i == 255); + LOG("Number of blocks %d", i); for (it = list; it != NULL; it = it->next) { -- cgit v1.2.3