Update of /home/cvsd/slony1/slony1-engine/tests
In directory main.slony.info:/tmp/cvs-serv5001/tests

Modified Files:
	run_test.sh 
Log Message:
Draw a whole pile of changes into HEAD from the 2.0 branch


Index: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** run_test.sh	5 Jan 2009 22:05:09 -0000	1.27
--- run_test.sh	11 Jun 2009 19:03:45 -0000	1.28
***************
*** 628,644 ****
  }      
  
! wait_for_catchup()
! {
!   node=1
!   status "waiting for nodes to catch up"
  
!   poll_cluster
  
!   sleep 20
  
!   poll_cluster
!   status "done"
! }
  
  diff_db()
  {
--- 628,654 ----
  }      
  
! # wait_for_catchup()
! # {
! #   node=1
! #   status "waiting for nodes to catch up"
  
! #   poll_cluster
  
! #   sleep 20
  
! #   poll_cluster
! #   status "done"
! # }
  
+ wait_for_catchup ()
+ {
+     eval onode=${ORIGINNODE:-"1"}
+     status "submit SYNC to node ${onode}, wait for event to propagate to all nodes..."
+     echo "include <${mktmp}/slonik.preamble>;" > $mktmp/wait-for-propagation.slonik
+     echo "sync (ID=${onode});" >> $mktmp/wait-for-propagation.slonik
+     echo "wait for event (origin=${onode},confirmed=ALL,wait on=${onode});" >> $mktmp/wait-for-propagation.slonik
+     $pgbindir/slonik < $mktmp/wait-for-propagation.slonik > $mktmp/wait-for-propagation.log 2>&1
+     status "...event propagated to all nodes"
+ }
  diff_db()
  {