From 651147df57cf92c075eeef44943ad093c9705a46 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Thu, 19 Jan 2017 14:26:57 +0100
Subject: [PATCH] TSCH: Fix incorrect test criteria for regression-tests

The tests are recognized as success when a return value by
rpl_ns_num_nodes(), the number of entries in the nodelist, tells all the
routes for the nodes in the network are installed.

There are eight nodes in addition to one root node. Therefore, the value
for test success should not be eight but nine since we have to take into
account an nodelist entry for the root.
---
 regression-tests/11-ipv6/19-cooja-rpl-tsch.csc           | 4 ++--
 regression-tests/11-ipv6/20-cooja-rpl-tsch-orchestra.csc | 4 ++--
 regression-tests/11-ipv6/21-cooja-rpl-tsch-security.csc  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/regression-tests/11-ipv6/19-cooja-rpl-tsch.csc b/regression-tests/11-ipv6/19-cooja-rpl-tsch.csc
index 7d25184bc..5f4e9b7f4 100644
--- a/regression-tests/11-ipv6/19-cooja-rpl-tsch.csc
+++ b/regression-tests/11-ipv6/19-cooja-rpl-tsch.csc
@@ -274,9 +274,9 @@ make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0</command
       <script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD;
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
- * 8 routing entries (i.e. can reach every node) */&#xD;
+ * 9 routing entries including one for the root (i.e. can reach every node) */&#xD;
 log.log("Waiting for routing tables to fill\n");&#xD;
-WAIT_UNTIL(msg.endsWith("Routing links (8 in total):"));&#xD;
+WAIT_UNTIL(msg.endsWith("Routing links (9 in total):"));&#xD;
 log.log("Root routing table ready\n");&#xD;
 &#xD;
 log.testOK(); /* Report test success and quit */</script>
diff --git a/regression-tests/11-ipv6/20-cooja-rpl-tsch-orchestra.csc b/regression-tests/11-ipv6/20-cooja-rpl-tsch-orchestra.csc
index 0f9d90233..1ab0d43f7 100644
--- a/regression-tests/11-ipv6/20-cooja-rpl-tsch-orchestra.csc
+++ b/regression-tests/11-ipv6/20-cooja-rpl-tsch-orchestra.csc
@@ -281,9 +281,9 @@ WAIT_UNTIL(msg.startsWith("Orchestra:"));&#xD;
 log.log("Orchestra started\n");&#xD;
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
- * 8 routing entries (i.e. can reach every node) */&#xD;
+ * 9 routing entries including one for the root (i.e. can reach every node) */&#xD;
 log.log("Waiting for routing tables to fill\n");&#xD;
-WAIT_UNTIL(msg.endsWith("Routing links (8 in total):"));&#xD;
+WAIT_UNTIL(msg.endsWith("Routing links (9 in total):"));&#xD;
 log.log("Root routing table ready\n");&#xD;
 &#xD;
 log.testOK(); /* Report test success and quit */</script>
diff --git a/regression-tests/11-ipv6/21-cooja-rpl-tsch-security.csc b/regression-tests/11-ipv6/21-cooja-rpl-tsch-security.csc
index 2a5716ef6..f046ad174 100644
--- a/regression-tests/11-ipv6/21-cooja-rpl-tsch-security.csc
+++ b/regression-tests/11-ipv6/21-cooja-rpl-tsch-security.csc
@@ -276,9 +276,9 @@ make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1</command
 log.log("Waiting for association with security\n");&#xD;
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
- * 8 routing entries (i.e. can reach every node) */&#xD;
+ * 9 routing entries including one for the root (i.e. can reach every node) */&#xD;
 log.log("Waiting for routing tables to fill\n");&#xD;
-WAIT_UNTIL(msg.endsWith("Routing links (8 in total):"));&#xD;
+WAIT_UNTIL(msg.endsWith("Routing links (9 in total):"));&#xD;
 log.log("Root routing table ready\n");&#xD;
 &#xD;
 log.testOK(); /* Report test success and quit */</script>