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

Modified Files:
      Tag: REL_2_0_STABLE
	generate_dml.sh 
Log Message:
Revise tests to NOT use poll_cluster to "wait until everything has
propagated according to sl_status" - instead, we use SYNC/WAIT FOR
EVENT, which submits an event against the origin, and then waits until
that specific event has propagated.

This means we're testing WAIT FOR EVENT a lot more stringently, and
allows tests to run a lot quicker in cases where it takes a while
for the nodes to decide they are instantaneously "in sync"


Index: generate_dml.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testmultiplemoves/generate_dml.sh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** generate_dml.sh	2 Apr 2007 18:52:19 -0000	1.5
--- generate_dml.sh	28 Apr 2009 21:48:20 -0000	1.5.2.1
***************
*** 67,71 ****
    eval port=\$PORT${originnode}
    generate_initdata
-   launch_poll
    status "loading data"
    $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
--- 67,70 ----
***************
*** 74,77 ****
--- 73,77 ----
    fi 
  
+   wait_for_catchup
    status "Move sets to node 3"
    init_preamble
***************
*** 79,83 ****
    do_ik
    status "Completed moving sets"
-   stop_poll
  
    ORIGINNODE=3
--- 79,82 ----
***************
*** 94,97 ****
--- 93,97 ----
  
    $pgbindir/psql -h $host -U $user -d $db < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
+   wait_for_catchup
    status "done"
  }