Skip to content

Commit

Permalink
Merge pull request #1062 from simonduq/travis-rpl-fix-logs
Browse files Browse the repository at this point in the history 
Fix log messages of Travis tests in 12-rpl
  • Loading branch information
Nicolas Tsiftes committed Jul 3, 2015
2 parents 3315d30 + 700c224 commit 8b2af09
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 25 deletions.
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/01-rpl-up-route.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ while(true) {
}
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -323,7 +323,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/02-rpl-root-reboot.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ while(true) {
}
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -323,7 +323,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/03-rpl-28-hours.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ while(true) {
}
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -272,7 +272,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/04-rpl-large-network.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7027,7 +7027,7 @@ while(true) {
}
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -7038,7 +7038,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/05-rpl-up-and-down-routes.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ while(true) {
}
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -321,7 +321,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
12 changes: 9 additions & 3 deletions regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,14 @@ GENERATE_MSG(2000000, "add-sink");

lostMsgs = 0;

TIMEOUT(2000000, if(lostMsgs == 0) { log.testOK(); } );
// we check that we got up to at least message 62 and
// (the simulation is 4000000ms = 66 minutes long)
// that we did not lose anything since 34
// (the sink is back at 2000000ms = 33 minutes)
TIMEOUT(4000000, if(lastMsg >= 62 && lastMissed <= 34) { log.testOK(); } );

lastMsg = -1;
lastMissed = -1;
packets = "_________";
hops = 0;

Expand All @@ -310,7 +315,7 @@ while(true) {
}
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -321,7 +326,8 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
lastMissed = num;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ while(true) {
node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -339,7 +339,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ while(true) {
node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -339,7 +339,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ while(true) {
node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -339,7 +339,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ while(true) {
node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -339,7 +339,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ while(true) {
node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -339,7 +339,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ while(true) {
node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);
} else if(msg.startsWith("Sending")) {
hops = 0;
} else if(msg.startsWith("#L")) {
} else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
hops++;
} else if(msg.startsWith("Data")) {
// log.log("" + msg + "\n"); 
Expand All @@ -339,7 +339,7 @@ while(true) {
// log.log("Num " + num + "\n");
if(lastMsg != -1) {
if(num != lastMsg + 1) {
numMissed = num - lastMsg;
numMissed = num - lastMsg - 1;
lostMsgs += numMissed;
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
Expand Down

0 comments on commit 8b2af09

Please sign in to comment.