deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

TSCH: Fix incorrect test criteria for regression-tests

Browse source 
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.
This commit is contained in:
Yasuyuki Tanaka 2017-01-19 14:26:57 +01:00
parent ac937eda24
commit 651147df57
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
regression-tests/11-ipv6/19-cooja-rpl-tsch.csc
View file

@ -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; <script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD;
&#xD; &#xD;
/* Wait until a node (can only be the DAGRoot) has&#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; 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; log.log("Root routing table ready\n");&#xD;
&#xD; &#xD;
log.testOK(); /* Report test success and quit */</script> log.testOK(); /* Report test success and quit */</script>

4
regression-tests/11-ipv6/20-cooja-rpl-tsch-orchestra.csc
View file

@ -281,9 +281,9 @@ WAIT_UNTIL(msg.startsWith("Orchestra:"));&#xD;
log.log("Orchestra started\n");&#xD; log.log("Orchestra started\n");&#xD;
&#xD; &#xD;
/* Wait until a node (can only be the DAGRoot) has&#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; 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; log.log("Root routing table ready\n");&#xD;
&#xD; &#xD;
log.testOK(); /* Report test success and quit */</script> log.testOK(); /* Report test success and quit */</script>

4
regression-tests/11-ipv6/21-cooja-rpl-tsch-security.csc
View file

@ -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; log.log("Waiting for association with security\n");&#xD;
&#xD; &#xD;
/* Wait until a node (can only be the DAGRoot) has&#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; 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; log.log("Root routing table ready\n");&#xD;
&#xD; &#xD;
log.testOK(); /* Report test success and quit */</script> log.testOK(); /* Report test success and quit */</script>