address a possible notify test failure

- wait for the transfer completion message to apear in the log instead
  of the notify message. this ensures we don't check for the presense of
  transfered records during the time between the notify and the
  transfer.

(cherry picked from commit ad32553c1d06dcc77542c52ea386ecaea0004f6b)
(cherry picked from commit dff94add3e1989eebdbb570206da4f1050581ff6)

diff --git a/CHANGES b/CHANGES
index 9520a2346c0758e4cd312a71f099701332de7b39..ee355cda8397035920c60ca4dea2fe98e1515aa2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4907.  [test]          Improved the reliabilty of the 'notify' system
+                       test. [GL #59]
+
 4905.  [bug]           irs_resconf_load() ignored resolv.conf syntax errors
                        when "domain" or "search" options were present in that
                        file. [GL #110]

diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index 60aa64b1f4163df34a895d25458be4ac1745922d..7dea2b11208df65ec0b90d3aba77bb6318618b66 100644 (file)
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -20,7 +20,7 @@
 #
 
 rm -f */named.memstats
-rm -f */named.run
+rm -f */named.run */named.run.prev
 rm -f */named.conf
 rm -f */named.port
 rm -f dig.out.?.ns5.test*
@@ -37,3 +37,4 @@ rm -f ns5/x21.bk-b.jnl
 rm -f ns5/x21.bk-c
 rm -f ns5/x21.bk-c.jnl
 rm -f ns5/x21.db.jnl
+rm -f tmp

diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index cf4a36392bffc479f9978562f67a76e2e6a05204..0fcef4ea9451fb8145b084344bf90de7cd1d6cdd 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -54,7 +54,8 @@ digcomp dig.out.ns2.test$n dig.out.ns3.test$n || ret=1
 [ $ret = 0 ] || echo_i "failed"
 status=`expr $ret + $status`
 
-echo_i "reloading with example2 using HUP and waiting up to 45 seconds"
+nextpart ns3/named.run > /dev/null
+
 sleep 1 # make sure filesystem time stamp is newer for reload.
 rm -f ns2/example.db
 cp -f ns2/example2.db ns2/example.db
@@ -65,11 +66,13 @@ else
     echo_i "reloading with example2 using rndc and waiting up to 45 seconds"
     $RNDCCMD 10.53.0.2 reload 2>&1 | sed 's/^/I:ns2 /'
 fi
+
 try=0
 while test $try -lt 45
 do
+    nextpart ns3/named.run > tmp
+    grep "transfer of 'example/IN' from 10.53.0.2#.*success" tmp > /dev/null && break
     sleep 1
-    grep 'notify from 10.53.0.2#[0-9][0-9]*: serial 2$' ns3/named.run > /dev/null && break
     try=`expr $try + 1`
 done
 
@@ -114,8 +117,9 @@ $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} . ns2
 try=0
 while test $try -lt 45
 do
+    nextpart ns3/named.run > tmp
+    grep "transfer of 'example/IN' from 10.53.0.2#.*success" tmp > /dev/null && break
     sleep 1
-    grep 'notify from 10.53.0.2#[0-9][0-9]*: serial 4$' ns3/named.run > /dev/null && break
     try=`expr $try + 1`
 done