Fix log parsing, broken by 8d74f717

tests/scripts/test020-proxycache

@@ -314,13 +314,13 @@ FIRST=$CNT
 # queries 2-6,8-10 are cacheable
 CACHEABILITY=0111110111
 grep CACHEABLE $LOG2 | awk '{ 
-		if ($2 == "NOT") 
+		if ($3 == "NOT") 
 			printf "Query %d not cacheable\n",NR
 		else 
 			printf "Query %d cacheable\n",NR
 	}' 
 CACHED=`grep CACHEABLE $LOG2 | awk '{ 
-		if ($2 == "NOT") 
+		if ($3 == "NOT") 
 			printf "0" 
 		else 
 			printf "1" 
@@ -330,6 +330,8 @@ if test "$CACHEABILITY" = "$CACHED" ; then
 	echo "Successfully verified cacheability"
 else 
 	echo "Error in verifying cacheability"
+	echo "$CACHED"
+	echo "$CACHEABILITY"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
 	exit 1
 fi
@@ -466,7 +468,7 @@ fi
 ANSWERABILITY=1110011
 grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{ 
 		if (NR > FIRST) { 
-			if ($2 == "NOT") 
+			if ($3 == "NOT") 
 				printf "Query %d not answerable\n",NR
 			else 
 				printf "Query %d answerable\n",NR 
@@ -474,7 +476,7 @@ grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{
 	}' 
 ANSWERED=`grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{ 
 		if (NR > FIRST) { 
-			if ($2 == "NOT") 
+			if ($3 == "NOT") 
 				printf "0" 
 			else 
 				printf "1"
@@ -535,7 +537,7 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 
-SLEEP=`expr $PCACHETTR + $PCACHE_CCPERIOD`
+SLEEP=`expr $PCACHETTR + $PCACHE_CCPERIOD + 1`
 echo "Waiting $SLEEP seconds for cache to refresh"
 
 sleep $SLEEP