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

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/testlogship/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	19 Oct 2007 15:22:35 -0000	1.5
--- generate_dml.sh	28 Apr 2009 21:48:19 -0000	1.5.2.1
***************
*** 71,75 ****
    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
--- 71,75 ----
    eval port=\$PORT${originnode}
    generate_initdata
! 
    status "loading data"
    $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
***************
*** 77,80 ****
--- 77,81 ----
      warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
    fi 
+   wait_for_catchup
    status "data load complete - nodes are seeded reasonably"
    status "pull log shipping dump" 
***************
*** 83,87 ****
    status "generate more data to test log shipping"
    generate_initdata
!   launch_poll
    status "loading data"
    $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/moredata.log 2> $mktmp/moredata.log
--- 84,88 ----
    status "generate more data to test log shipping"
    generate_initdata
!   wait_for_catchup
    status "loading data"
    $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/moredata.log 2> $mktmp/moredata.log
***************
*** 154,157 ****
    NUMNODES=4
    status "Changed number of nodes to 4 to reflect the log shipping node"
! 
  }
--- 155,158 ----
    NUMNODES=4
    status "Changed number of nodes to 4 to reflect the log shipping node"
!   wait_for_catchup
  }