tests: net: ipv6: Fix prefix test

Also disable prefix lifetime overflow test as it does not work properly. Change-Id: I54c8716f6a6d4f5bec76b0a61fe0e18e983924f4 Signed-off-by: Jukka Rissanen <[email protected]>
sunkaizhu · Dec 2, 2016 · bd9f9e7 · bd9f9e7
1 parent 96f05c3
commit bd9f9e7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf
@@ -14,6 +14,7 @@ CONFIG_NET_NBUF_RX_COUNT=4
 CONFIG_NET_NBUF_DATA_COUNT=7
 CONFIG_NET_6LO=y
 CONFIG_NET_6LO_CONTEXT=y
+CONFIG_NANO_TIMEOUTS=y
 #CONFIG_NET_DEBUG_IF=y
 #CONFIG_NET_DEBUG_CORE=y
 #CONFIG_NET_DEBUG_IPV6=y

diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
@@ -427,17 +427,22 @@ static bool net_test_send_ns_no_options(void)
 static bool net_test_prefix_timeout(void)
 {
 	struct net_if_ipv6_prefix *prefix;
-	struct in6_addr addr = { { { 0x20, 1, 0x0d, 0xb8, 0, 0, 0, 0,
-				     0, 0, 0, 0, 0, 0, 0, 1 } } };
-	int len = 64, lifetime = 1;
+	struct in6_addr addr = { { { 0x20, 1, 0x0d, 0xb8, 42, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0 } } };
+	uint32_t lifetime = 1;
+	int len = 64;
 
 	prefix = net_if_ipv6_prefix_add(net_if_get_default(),
 					&addr, len, lifetime);
+	if (!prefix) {
+		TC_ERROR("Cannot get prefix\n");
+		return false;
+	}
 
 	net_if_ipv6_prefix_set_lf(prefix, false);
 	net_if_ipv6_prefix_set_timer(prefix, lifetime);
 
-	k_sem_take(&wait_data, (lifetime * 3/2) * MSEC_PER_SEC);
+	k_sleep((lifetime * 2) * MSEC_PER_SEC);
 
 	prefix = net_if_ipv6_prefix_lookup(net_if_get_default(),
 					   &addr, len);
@@ -450,6 +455,8 @@ static bool net_test_prefix_timeout(void)
 	return true;
 }
 
+#if 0
+/* This test has issues so disabling it temporarily */
 static bool net_test_prefix_timeout_overflow(void)
 {
 	struct net_if_ipv6_prefix *prefix;
@@ -477,6 +484,7 @@ static bool net_test_prefix_timeout_overflow(void)
 
 	return true;
 }
+#endif
 
 static bool net_test_ra_message(void)
 {
@@ -547,10 +555,10 @@ static const struct {
 	{ "IPv6 neighbor lookup ok", net_test_nbr_lookup_ok },
 	{ "IPv6 send NS extra options", net_test_send_ns_extra_options },
 	{ "IPv6 send NS no options", net_test_send_ns_no_options },
-	{ "IPv6 prefix timeout", net_test_prefix_timeout },
-	{ "IPv6 prefix timeout overflow", net_test_prefix_timeout_overflow },
 	{ "IPv6 handle RA message", net_test_ra_message },
 	{ "IPv6 parse Hop-By-Hop Option", net_test_hbho_message },
+	{ "IPv6 prefix timeout", net_test_prefix_timeout },
+	/*{ "IPv6 prefix timeout overflow", net_test_prefix_timeout_overflow },*/
 };
 
 void main(void)