- merge from ronnie, and use wait instead of sleep in test scripts

(This used to be ctdb commit 6e6812641e3ce7afae7bd46ed317a885839fdd4f)

diff --cc ctdb/tests/bench.sh
index 50e9e08f995dbc6aa85ea3b4aa960c0c69a7e815,50e9e08f995dbc6aa85ea3b4aa960c0c69a7e815..1374dc707c79ad4e1ba8cd072848507357565459
--- 1/ctdb/tests/bench.sh
--- 2/ctdb/tests/bench.sh
+++ b/ctdb/tests/bench.sh
@@@ -5,5 -5,5 +5,5 @@@ killall -q ctdb_benc
  echo "Trying 2 nodes"
  bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.2:9001 $* &
  bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.1:9001 $*
++wait
  
--killall -q ctdb_bench

diff --cc ctdb/tests/bench1.sh
index 3481d82be297092326e96920d3094a292c82bc35,3481d82be297092326e96920d3094a292c82bc35..9adcf3198b5288ce6a3737836e7d89a56302f521
--- 1/ctdb/tests/bench1.sh
--- 2/ctdb/tests/bench1.sh
+++ b/ctdb/tests/bench1.sh
@@@ -4,5 -4,5 +4,4 @@@ killall -q ctdb_benc
  
  echo "Trying 1 nodes"
  bin/ctdb_bench --nlist tests/1node.txt --listen 127.0.0.2:9001 $*
--
--killall -q ctdb_bench
++wait

diff --cc ctdb/tests/fetch.sh
index 9020fdc230e718e1a48ecab34efc9d6ee1836360,9020fdc230e718e1a48ecab34efc9d6ee1836360..73192e70ae330ad027d0d782f069c5aede9d3897
--- 1/ctdb/tests/fetch.sh
--- 2/ctdb/tests/fetch.sh
+++ b/ctdb/tests/fetch.sh
@@@ -5,13 -5,13 +5,11 @@@ killall -q ctdb_fetc
  echo "Trying 2 nodes"
  $VALGRIND bin/ctdb_fetch --nlist tests/nodes.txt --listen 127.0.0.2:9001 $* &
  $VALGRIND bin/ctdb_fetch --nlist tests/nodes.txt --listen 127.0.0.1:9001 $* 
--
--killall -q ctdb_fetch
++wait
  
  echo "Trying 4 nodes"
  $VALGRIND bin/ctdb_fetch --nlist tests/4nodes.txt --listen 127.0.0.4:9001 $* &
  $VALGRIND bin/ctdb_fetch --nlist tests/4nodes.txt --listen 127.0.0.3:9001 $* &
  $VALGRIND bin/ctdb_fetch --nlist tests/4nodes.txt --listen 127.0.0.2:9001 $* &
  $VALGRIND bin/ctdb_fetch --nlist tests/4nodes.txt --listen 127.0.0.1:9001 $* 
--
--killall -q ctdb_fetch
++wait

diff --cc ctdb/tests/fetch1.sh
index 3562ca867e614e84e3d0561c180aa2150ad8bc21,3562ca867e614e84e3d0561c180aa2150ad8bc21..db584ec0120407fab6ea4ca51134cb8c4fcb6bc3
--- 1/ctdb/tests/fetch1.sh
--- 2/ctdb/tests/fetch1.sh
+++ b/ctdb/tests/fetch1.sh
@@@ -4,5 -4,5 +4,4 @@@ killall -q ctdb_fetch
  
  echo "Trying node"
  bin/ctdb_fetch1 --nlist tests/1node.txt --listen 127.0.0.1:9001 $* 
--
--killall -q ctdb_fetch1
++wait

diff --cc ctdb/tests/messaging.sh
index 179a2bef88d584cd20d0382a3c5947d94657573f,179a2bef88d584cd20d0382a3c5947d94657573f..46f3e4dc774b3d96d2230c8a1839251eeead2311
--- 1/ctdb/tests/messaging.sh
--- 2/ctdb/tests/messaging.sh
+++ b/ctdb/tests/messaging.sh
@@@ -5,5 -5,5 +5,4 @@@ killall -q ctdb_messagin
  echo "Trying 2 nodes"
  bin/ctdb_messaging --nlist tests/nodes.txt --listen 127.0.0.2:9001 $* &
  bin/ctdb_messaging --nlist tests/nodes.txt --listen 127.0.0.1:9001 $*
--
--killall -q ctdb_messaging
++wait

diff --cc ctdb/tests/test.sh
index b1ed1d20d788b939da8d7c4c83eebf11948f1404,d913d751a68741d26b94396655bdd1b4554279a6..23fdb8d6ced8c7f1c5f1fbf68c43d917860aa9da
--- 1/ctdb/tests/test.sh
--- 2/ctdb/tests/test.sh
+++ b/ctdb/tests/test.sh
@@@ -3,18 -3,14 +3,15 @@@
  killall -q ctdb_test
  
  
--echo "Trying 2 nodes"
++echo "Trying 2 nodes ..."
  $VALGRIND bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.1:9001 &
  $VALGRIND bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.2:9001
 -sleep 3
++wait
  
- sleep 3
- killall ctdb_test
- 
--echo "Trying 4 nodes"
++echo "Trying 4 nodes ..."
  $VALGRIND bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.1:9001 &
  $VALGRIND bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.2:9001 &
  $VALGRIND bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.3:9001 &
  $VALGRIND bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.4:9001
--sleep 3
++wait
 +
- killall ctdb_test

diff --cc ctdb/tests/test1.sh
index f13799b45c75f69cfedc1e028136c442cee93fd2,0581458c4edc374caaaff53b2307a67209ed01a3..42256f22f9d51871b10d543055322cef1640b8c5
--- 1/ctdb/tests/test1.sh
--- 2/ctdb/tests/test1.sh
+++ b/ctdb/tests/test1.sh
@@@ -2,5 -2,7 +2,8 @@@
  
  echo "Testing daemon mode"
  bin/ctdb_test --nlist tests/1node.txt --listen 127.0.0.1:9001
 -sleep 3
++wait
+ 
  echo "Testing self connect"
  bin/ctdb_test --nlist tests/1node.txt --listen 127.0.0.1:9001 --self-connect
++wait