Commit d0dc01dd authored by Brian Wellington's avatar Brian Wellington
Browse files

Shorten a bunch of sleeps. Let's see if this breaks anything.

parent 3b77946b
......@@ -15,13 +15,11 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.11 2001/01/09 21:43:36 bwelling Exp $
# $Id: tests.sh,v 1.12 2001/01/17 20:53:41 bwelling Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sleep 5
status=0
echo "I:using resolv.conf"
......@@ -38,7 +36,7 @@ if [ $? != 0 ]; then
status=1
rm -f lwresd1/lwresd.pid
fi
sleep 6
sleep 5
if [ -f lwresd1/lwresd.pid ]; then
echo "I:lwresd1 didn't die when sent a SIGTERM"
kill -KILL `cat lwresd1/lwresd.pid` > /dev/null 2>&1
......
......@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.27 2001/01/09 21:43:50 bwelling Exp $
# $Id: tests.sh,v 1.28 2001/01/17 20:53:42 bwelling Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
......@@ -34,9 +34,8 @@ $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
rm -f ns2/example.db
cp ns2/example2.db ns2/example.db
sleep 6
kill -HUP `cat ns2/named.pid`
sleep 60
sleep 45
$DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
@10.53.0.2 a -p 5300 > dig.out.ns2 || status=1
......@@ -104,9 +103,8 @@ if [ -f ns2/named.pid ]; then
fi
cp ns2/example4.db ns2/example.db
sleep 6
(cd ns2 ; $NAMED -c named.conf -d 99 -g >> named.run 2>&1 & )
sleep 60
sleep 45
$DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
@10.53.0.2 a -p 5300 > dig.out.ns2 || status=1
......
......@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: run.sh,v 1.36 2001/01/09 21:42:21 bwelling Exp $
# $Id: run.sh,v 1.37 2001/01/17 20:53:39 bwelling Exp $
#
# Run a system test.
......@@ -79,8 +79,6 @@ fi
# Start name servers running
sh start.sh $test || exit 1
sleep 10
# Run the tests
( cd $test ; sh tests.sh )
......
......@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: start.sh,v 1.32 2001/01/09 21:42:24 bwelling Exp $
# $Id: start.sh,v 1.33 2001/01/17 20:53:40 bwelling Exp $
#
# Start name servers for running system tests.
......@@ -74,7 +74,6 @@ do
sh ./stop.sh $1
exit 1
fi
sleep 1
done
) || exit 1
done
......@@ -107,7 +106,6 @@ do
echo "I:Couldn't start lwresd $d"
exit 1
fi
sleep 1
done
) || exit 1
done
......@@ -140,7 +138,6 @@ do
echo "I:Couldn't start ans $d"
exit 1
fi
sleep 1
done
) || exit 1
done
......@@ -149,8 +146,6 @@ done
status=0
sleep 5
for d in ns[0-9]*
do
try=0
......@@ -171,7 +166,7 @@ do
echo "R:FAIL"
exit 1
fi
sleep 9
sleep 2
done
done
rm -f dig.out
......
......@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.25 2001/01/09 21:45:29 bwelling Exp $
# $Id: tests.sh,v 1.26 2001/01/17 20:53:44 bwelling Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
......@@ -38,13 +38,12 @@ cp ns2/named2.conf ns2/named.conf
cp ns3/named2.conf ns3/named.conf
cp ns2/example2.db ns2/example.db
echo "I:sleeping five seconds then reloading ns2 and ns3 with rndc"
sleep 5
echo "I:reloading ns2 and ns3 with rndc"
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 | sed 's/^/I:ns3 /'
echo "I:sleeping one minute"
sleep 60
echo "I:sleeping for 20 seconds"
sleep 20
echo "I:fetching a.example from ns2's 10.53.0.4, source address 10.53.0.4"
$DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment