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

Modified Files:
	gen_ddl_slonik.sh 
Log Message:
Changes to WAIT FOR EVENT requests; the "ongoing saga" of getting the
tests to be a bit more conservative so they are more likely to pass :-).


Index: gen_ddl_slonik.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testmergeset/gen_ddl_slonik.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gen_ddl_slonik.sh	12 Jun 2008 18:17:49 -0000	1.4
--- gen_ddl_slonik.sh	23 Sep 2008 21:46:23 -0000	1.5
***************
*** 9,12 ****
--- 9,14 ----
         EVENT NODE = 1
      );
+   sync(id=1);
+   wait for event (origin=1, confirmed=all, wait on=1);
  
    create set (id=999, origin = 1, comment='Temporary set for new partition');
***************
*** 14,28 ****
    set add table (set id=999, origin=1, id=${tableid}, fully qualified name='public.sales_txns_${year}_${month}');
    subscribe set (id=999, provider=1, receiver=2, forward = yes);
!   wait for event (origin=2, confirmed=1, wait on=1);
    sync (id=1);
    wait for event (origin=1, confirmed=2, wait on=2);
    subscribe set (id=999, provider=1, receiver=3, forward = no);
!   wait for event (origin=3, confirmed=1, wait on=1);
    sync (id=1);
    wait for event (origin=1, confirmed=3, wait on=3);
    subscribe set (id=999, provider=2, receiver=4, forward = no);
!   wait for event (origin=4, confirmed=1, wait on=1);
    sync (id=1);
!   wait for event (origin=1, confirmed=4, wait on=4);
    merge set (ID = 1, ADD ID = 999, ORIGIN = 1 );
  
--- 16,34 ----
    set add table (set id=999, origin=1, id=${tableid}, fully qualified name='public.sales_txns_${year}_${month}');
    subscribe set (id=999, provider=1, receiver=2, forward = yes);
!   sync (id=2);
!   wait for event (origin=2, confirmed=1, wait on=2);
    sync (id=1);
    wait for event (origin=1, confirmed=2, wait on=2);
    subscribe set (id=999, provider=1, receiver=3, forward = no);
!   sync (id=3);
!   wait for event (origin=3, confirmed=1, wait on=3);
    sync (id=1);
    wait for event (origin=1, confirmed=3, wait on=3);
    subscribe set (id=999, provider=2, receiver=4, forward = no);
!   sync (id=4);
!   wait for event (origin=4, confirmed=1, wait on=4);
    sync (id=1);
!   wait for event (origin=1, confirmed=all, wait on=1);
!   sleep(seconds=4);
    merge set (ID = 1, ADD ID = 999, ORIGIN = 1 );