From 6881f919e7ec762bfdd4c11dec3d53d9f583dbe5 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 22 Jan 2019 22:24:24 -0800 Subject: [PATCH] fix notify test test the average delay between notifies instead of the minimum delay; this helps avoid unnecessary test failures on systems with bursty network performance. --- bin/tests/system/notify/tests.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh index 728c6c2af6..fb2eb7448f 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/tests.sh @@ -63,6 +63,8 @@ awk '/x[0-9].*sending notify to/ { if (last) { delta = this - last; print delta; + + total += delta; if (!maxdelta || delta > maxdelta) { maxdelta = delta; } @@ -75,10 +77,12 @@ awk '/x[0-9].*sending notify to/ { count++; } END { - print "mindelta:", mindelta - print "maxdelta:" maxdelta + average = total / count; + print "mindelta:", mindelta; + print "maxdelta:" maxdelta; print "count:", count; - if (mindelta < 0.180) exit(1); + print "average:", average; + if (average < 0.180) exit(1); if (count < 20) exit(1); }' ns2/named.run > awk.out.ns2.test$n || ret=1 [ $ret = 0 ] || echo_i "failed" @@ -221,7 +225,7 @@ do txt > dig.out.c.ns5.test$n || ret=1 grep "test string" dig.out.b.ns5.test$n > /dev/null && grep "test string" dig.out.c.ns5.test$n > /dev/null && - break + break sleep 1 done grep "test string" dig.out.b.ns5.test$n > /dev/null || ret=1