aboutsummaryrefslogtreecommitdiff
path: root/scripts/testroot.sh
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2007-12-17 20:02:52 +0000
committerRob Austein <sra@hactrn.net>2007-12-17 20:02:52 +0000
commit076708ed9f3b28fb2ec2ad72e8d0c85334f01d01 (patch)
treedbf6c9d65fc4d3ccb139842fcda26f679bf9b5ba /scripts/testroot.sh
parent3a292afd511c722ca82d40126ca62d025ad28c76 (diff)
Better error handling on IRDB queries. Partial support for new tag
attributes. Fix race conditions in test scripts. svn path=/scripts/biz-certs/Bob-CA.srl; revision=1386
Diffstat (limited to 'scripts/testroot.sh')
-rw-r--r--scripts/testroot.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/testroot.sh b/scripts/testroot.sh
index d8b9b1d3..b4d62c36 100644
--- a/scripts/testroot.sh
+++ b/scripts/testroot.sh
@@ -30,7 +30,9 @@ mysql -u rpki -p`awk '$1 == "sql-password" {print $3}' rpkid.conf` rpki <../docs
# Start rpkid so we can configure it, make sure we shut it down on exit
python rpkid.py & rpkid=$!
-trap "kill $rpkid" 0
+trap "kill $rpkid" 0 1 2 3 13 15
+
+: Waiting to let rpkid start up; sleep 5
# Create a self instance
@@ -72,7 +74,9 @@ then
python testroot.py & testroot=$!
python irdb.py & irdb=$!
- trap "kill $rpkid $irdb $testroot" 0
+ trap "kill $rpkid $irdb $testroot" 0 1 2 3 13 15
+
+ : Waiting to let daemons start up; sleep 5
date; time python http-client.py
date; time python testpoke.py -r list