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)
(cherry picked from commit 5a5e476d00e4c5169c9c1d200fc9600c98c7d0bd)

diff --git a/CHANGES b/CHANGES
index 6b9d4e1b970728376a5cd63c9651d814585089cc..8c1207abf58446d1bada7b5d1da264a8ef552944 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 09d88cdf123945ee2ecf1a7bead15a26aa7c9ed5..384dafec89738b59debb39d7362cd9e0e04da240 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -54,17 +54,21 @@ 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
+
 echo_i "reloading with example2 using HUP and waiting up to 45 seconds"
 $KILL -HUP `cat ns2/named.pid`
+
 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
 
@@ -102,8 +106,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